validate doc merge

Description

When the changes for NMS-13807 was merged to foundation-2021, there were conflicts with other changes to docs/modules/operation/pages/flows/introduction.adoc that had happened in release-29.x.

I resolved them, I think, but it should be reviewed in the H29 branch to be sure I did it right. grinning face with big eyes

Foundation-2021 version:

* <<telemetryd/introduction.adoc#ga-telemetryd, Telemetryd>> receives and decodes flows on {page-component-title}. * Telemetryd adapters convert the flows to a canonical flow model and dispatch these to the flow repository. * The flow repository enriches the flows and persists them to Elasticsearch: ** The <<flows/classification-engine.adoc#ga-flow-support-classification-engine, classification engine>> tags flows with an application name. ** Metadata related to associated nodes (such as IDs and categories) are also added to the flows. * The REST API supports generating both summaries and time series data from the flows stored in the flow repository. * OpenNMS Helm visualizes the flow data through the flow datasource, which interfaces with the {page-component-title} REST API.

Horizon 29 version:

* <<telemetryd/introduction.adoc#ga-telemetryd, Telemetryd>> receives and decodes flows on both {page-component-title} and Minion. * Telemetryd adapters convert the flows to a canonical flow model. * Flows are enriched: ** Flows are tagged with an application name via the <<flows/classification-engine.adoc#ga-flow-support-classification-engine, classification engine>>. ** Metadata related to associated nodes (such as IDs and categories) are also added to the flows. * Enriched flows are persisted in Elasticsearch and/or forwarded to Kafka. * You can use <<flows/nephron.adoc#ga-nephron, Nephron>> to aggregate flows and output aggregates to Elasticsearch, Cortex, or Kafka. * The REST API supports generating both summaries and time series data from the flows or flow aggregates stored in Elasticsearch. * Use OpenNMS Helm to visualize flows and/or flow aggregates: ** Use the "Flow Deep Dive" dashboard to visualize flows and flow aggregates that are stored in Elasticsearch using the flow datasource that interfaces with the {page-component-title} REST API. ** Use the "Cortex Flow Deep Dive" dashboard that uses a Prometheus datasource to access flow aggregates stored in Cortex.

My modified version committed to release-29.x:

* <<telemetryd/introduction.adoc#ga-telemetryd, Telemetryd>> receives and decodes flows on {page-component-title}. * Telemetryd adapters convert the flows to a canonical flow model. * Flows are enriched: ** The <<flows/classification-engine.adoc#ga-flow-support-classification-engine, classification engine>> tags flows with an application name. ** Metadata related to associated nodes (such as IDs and categories) are also added to the flows. * Enriched flows are persisted in Elasticsearch and/or forwarded to Kafka. * You can use <<flows/nephron.adoc#ga-nephron, Nephron>> to aggregate flows and output aggregates to Elasticsearch, Cortex, or Kafka. * The REST API supports generating both summaries and time series data from the flows or flow aggregates stored in Elasticsearch. * Use OpenNMS Helm to visualize flows and/or flow aggregates: ** Use the "Flow Deep Dive" dashboard to visualize flows and flow aggregates that are stored in Elasticsearch using the flow datasource that interfaces with the {page-component-title} REST API. ** Use the "Cortex Flow Deep Dive" dashboard that uses a Prometheus datasource to access flow aggregates stored in Cortex.

Acceptance / Success Criteria

None

Lucidchart Diagrams

Activity

Benjamin Reed December 10, 2021 at 7:20 PM

marking as fixed without a fix version, since my manual merge was alright, thanks for taking a look

Bonnie Robinson December 10, 2021 at 6:09 PM

Yes. This works. Thanks for figuring it out.

I'll have to determine how to deal with the Cortex content when reconciling with the new Flows structure.

Fixed

Details

Assignee

Reporter

Affects versions

Priority

PagerDuty

Created December 10, 2021 at 6:01 PM
Updated December 10, 2021 at 7:20 PM
Resolved December 10, 2021 at 7:20 PM

Flag notifications