Add back ecs and kubernetes merge rules. (#221)

translator/config/schema.go

@@ -16,6 +16,10 @@ func GetJsonSchema() string {
 	return schema
 }
 
+func OverwriteSchema(newSchema string) {
+	schema = newSchema
+}
+
 // Translate Sample:
 // (root).agent.metrics_collection_interval -> /agent/metrics_collection_interval
 // (root).metrics.metrics_collected.cpu.resources.1 -> /metrics/metrics_collected/cpu/resources/1

translator/config/schema_test.go

@@ -13,12 +13,18 @@ import (
 
 func TestGetJsonSchema(t *testing.T) {
 	jsonFile, err := os.ReadFile("./schema.json")
-	if err != nil {
-		require.NoError(t, err)
-	}
+	require.NoError(t, err)
 	assert.Equal(t, string(jsonFile), GetJsonSchema(), "Json schema is inconsistent")
 }
 
+func TestOverwriteSchema(t *testing.T) {
+	originalSchema := GetJsonSchema()
+	newSchema := "new schema"
+	OverwriteSchema(newSchema)
+	assert.NotEqual(t, originalSchema, GetJsonSchema())
+	assert.Equal(t, newSchema, GetJsonSchema())
+}
+
 func TestGetFormattedPath(t *testing.T) {
 	assert.Equal(t, "/metrics/metrics_collected/cpu/resources/1", GetFormattedPath("(root).metrics.metrics_collected.cpu.resources.1"))
 	assert.Equal(t, "/metrics/metrics_collected/cpu", GetFormattedPath("(root).metrics.metrics_collected.cpu"))

translator/jsonconfig/mergeJsonConfig_test.go

@@ -30,7 +30,6 @@ var testDataList = []TestData{
 	{"MixedSection_CompleteLinuxConfig", 3, 3, false},
 	{"MixedSection_CompleteWindowsConfig", 4, 4, false},
 	{"CustomizedTest_PutWhateverYouWantToQuicklyTestHere", 5, 2, false},
-
 	{"FailureTest_AgentConflicts", 6, 2, true},
 	{"FailureTest_MetricsConflicts", 7, 2, true},
 	{"FailureTest_LogsConflicts", 8, 2, true},

translator/jsonconfig/sampleJsonConfig/test_5/expected_output.json

@@ -15,6 +15,9 @@
     "metrics_collected": {
       "kubernetes": {
         "cluster_name": "TestCluster"
+      },
+      "ecs": {
+        "metrics_collection_interval": 30
       }
     }
   },

translator/jsonconfig/sampleJsonConfig/test_5/input_1.json

@@ -12,6 +12,8 @@
     "metrics_collected": {
       "kubernetes": {
         "cluster_name": "TestCluster"
+      },
+      "ecs": {
       }
     }
   },

translator/jsonconfig/sampleJsonConfig/test_5/input_2.json

@@ -8,6 +8,13 @@
           }
         ]
       }
+    },
+    "metrics_collected": {
+      "kubernetes": {
+      },
+      "ecs": {
+        "metrics_collection_interval": 30
+      }
     }
   },
   "metrics": {

translator/registerrules/register_rules.go

@@ -14,6 +14,8 @@ import (
 	_ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/files/collect_list"
 	_ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/windows_events"
 	_ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/windows_events/collect_list"
+	_ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/ecs"
+	_ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/kubernetes"
 	_ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus"
 	_ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery"
 	_ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel"

translator/translate/logs/metrics_collected/ecs/ecs.go

@@ -0,0 +1,31 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+package ecs
+
+import (
+	"github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule"
+	"github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil"
+	parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected"
+)
+
+const SectionKey = "ecs"
+
+type ECS struct {
+}
+
+func GetCurPath() string {
+	curPath := parent.GetCurPath() + SectionKey + "/"
+	return curPath
+}
+
+var MergeRuleMap = map[string]mergeJsonRule.MergeRule{}
+
+func (e *ECS) Merge(source map[string]interface{}, result map[string]interface{}) {
+	mergeJsonUtil.MergeMap(source, result, SectionKey, MergeRuleMap, GetCurPath())
+}
+
+func init() {
+	e := new(ECS)
+	parent.MergeRuleMap[SectionKey] = e
+}

translator/translate/logs/metrics_collected/kubernetes/kubernetes.go

@@ -0,0 +1,31 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+package kubernetes
+
+import (
+	"github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule"
+	"github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil"
+	parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected"
+)
+
+const SectionKey = "kubernetes"
+
+type Kubernetes struct {
+}
+
+func GetCurPath() string {
+	curPath := parent.GetCurPath() + SectionKey + "/"
+	return curPath
+}
+
+var MergeRuleMap = map[string]mergeJsonRule.MergeRule{}
+
+func (k *Kubernetes) Merge(source map[string]interface{}, result map[string]interface{}) {
+	mergeJsonUtil.MergeMap(source, result, SectionKey, MergeRuleMap, GetCurPath())
+}
+
+func init() {
+	k := new(Kubernetes)
+	parent.MergeRuleMap[SectionKey] = k
+}