-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cherry-pick to 7.10: Fixing logic to keep list of unique cluster UUIDs (
#22808) (#22817) * Fixing logic to keep list of unique cluster UUIDs (#22808) * Fixing logic to keep list of unique cluster UUIDs * Adding CHANGELOG entry * Use common.StringSet * Adding more test cases * Adding back logic to broadly override cluster UUID for all pipelines, if set * Removing ToSlice() * Fixing loop * Fixing up CHANGELOG
- Loading branch information
1 parent
f031ddb
commit 2831eb8
Showing
6 changed files
with
620 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,328 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| // +build !integration | ||
|
|
||
| package node | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/elastic/beats/v7/metricbeat/module/logstash" | ||
| ) | ||
|
|
||
| func TestMakeClusterToPipelinesMap(t *testing.T) { | ||
| tests := map[string]struct { | ||
| pipelines []logstash.PipelineState | ||
| overrideClusterUUID string | ||
| expectedMap map[string][]logstash.PipelineState | ||
| }{ | ||
| "no_vertex_cluster_id": { | ||
| pipelines: []logstash.PipelineState{ | ||
| { | ||
| ID: "test_pipeline", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_1", | ||
| }, | ||
| { | ||
| "id": "vertex_2", | ||
| }, | ||
| { | ||
| "id": "vertex_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| overrideClusterUUID: "prod_cluster_id", | ||
| expectedMap: map[string][]logstash.PipelineState{ | ||
| "prod_cluster_id": { | ||
| { | ||
| ID: "test_pipeline", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_1", | ||
| }, | ||
| { | ||
| "id": "vertex_2", | ||
| }, | ||
| { | ||
| "id": "vertex_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "one_vertex_cluster_id": { | ||
| pipelines: []logstash.PipelineState{ | ||
| { | ||
| ID: "test_pipeline", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_1", | ||
| "cluster_uuid": "es_1", | ||
| }, | ||
| { | ||
| "id": "vertex_2", | ||
| }, | ||
| { | ||
| "id": "vertex_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| overrideClusterUUID: "prod_cluster_id", | ||
| expectedMap: map[string][]logstash.PipelineState{ | ||
| "prod_cluster_id": { | ||
| { | ||
| ID: "test_pipeline", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_1", | ||
| "cluster_uuid": "es_1", | ||
| }, | ||
| { | ||
| "id": "vertex_2", | ||
| }, | ||
| { | ||
| "id": "vertex_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "two_pipelines": { | ||
| pipelines: []logstash.PipelineState{ | ||
| { | ||
| ID: "test_pipeline_1", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_1_1", | ||
| "cluster_uuid": "es_1", | ||
| }, | ||
| { | ||
| "id": "vertex_1_2", | ||
| }, | ||
| { | ||
| "id": "vertex_1_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| ID: "test_pipeline_2", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_2_1", | ||
| }, | ||
| { | ||
| "id": "vertex_2_2", | ||
| }, | ||
| { | ||
| "id": "vertex_2_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| overrideClusterUUID: "prod_cluster_id", | ||
| expectedMap: map[string][]logstash.PipelineState{ | ||
| "prod_cluster_id": { | ||
| { | ||
| ID: "test_pipeline_1", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_1_1", | ||
| "cluster_uuid": "es_1", | ||
| }, | ||
| { | ||
| "id": "vertex_1_2", | ||
| }, | ||
| { | ||
| "id": "vertex_1_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| ID: "test_pipeline_2", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_2_1", | ||
| }, | ||
| { | ||
| "id": "vertex_2_2", | ||
| }, | ||
| { | ||
| "id": "vertex_2_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "no_override_cluster_id": { | ||
| pipelines: []logstash.PipelineState{ | ||
| { | ||
| ID: "test_pipeline_1", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_1_1", | ||
| "cluster_uuid": "es_1", | ||
| }, | ||
| { | ||
| "id": "vertex_1_2", | ||
| "cluster_uuid": "es_2", | ||
| }, | ||
| { | ||
| "id": "vertex_1_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| ID: "test_pipeline_2", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_2_1", | ||
| }, | ||
| { | ||
| "id": "vertex_2_2", | ||
| }, | ||
| { | ||
| "id": "vertex_2_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| overrideClusterUUID: "", | ||
| expectedMap: map[string][]logstash.PipelineState{ | ||
| "es_1": { | ||
| { | ||
| ID: "test_pipeline_1", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_1_1", | ||
| "cluster_uuid": "es_1", | ||
| }, | ||
| { | ||
| "id": "vertex_1_2", | ||
| "cluster_uuid": "es_2", | ||
| }, | ||
| { | ||
| "id": "vertex_1_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "es_2": { | ||
| { | ||
| ID: "test_pipeline_1", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_1_1", | ||
| "cluster_uuid": "es_1", | ||
| }, | ||
| { | ||
| "id": "vertex_1_2", | ||
| "cluster_uuid": "es_2", | ||
| }, | ||
| { | ||
| "id": "vertex_1_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "": { | ||
| { | ||
| ID: "test_pipeline_2", | ||
| Graph: &logstash.GraphContainer{ | ||
| Graph: &logstash.Graph{ | ||
| Vertices: []map[string]interface{}{ | ||
| { | ||
| "id": "vertex_2_1", | ||
| }, | ||
| { | ||
| "id": "vertex_2_2", | ||
| }, | ||
| { | ||
| "id": "vertex_2_3", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for name, test := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| actualMap := makeClusterToPipelinesMap(test.pipelines, test.overrideClusterUUID) | ||
| require.Equal(t, test.expectedMap, actualMap) | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.