Update schema

aws · Jun 17, 2024 · 296c249 · 296c249
1 parent 778c028
commit 296c249
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 31 deletions.
diff --git a/translator/config/sampleSchema/invalidLogsWithJMX.json b/translator/config/sampleSchema/invalidLogsWithJMX.json
@@ -1,11 +1,9 @@
 {
   "logs": {
     "metrics_collected": {
-      "application_signals": {
-        "jmx": {
-          "jvm": {
-            "measurement": []
-          }
+      "jmx": {
+        "jvm": {
+          "measurement": []
         }
       }
     }

diff --git a/translator/config/sampleSchema/validLogsWithJMX.json b/translator/config/sampleSchema/validLogsWithJMX.json
@@ -2,30 +2,24 @@
   "logs": {
     "metrics_collected": {
       "application_signals": {
-        "jmx": {
-          "jvm": {
-            "measurement": [
-              "jvm.classes.loaded"
-            ]
-          }
+        "enable_jvm": true
+      },
+      "jmx": {
+        "jvm": {
+          "measurement": [
+            "jvm.classes.loaded"
+          ]
+        },
+        "tomcat": {
+          "measurement": [
+            {
+              "name": "tomcat.sessions",
+              "rename": "TOMCAT_SESSIONS"
+            }
+          ]
         }
       },
       "kubernetes": {
-        "jmx": {
-          "jvm": {
-            "measurement": [
-              "jvm.classes.loaded"
-            ]
-          },
-          "tomcat": {
-            "measurement": [
-              {
-                "name": "tomcat.sessions",
-                "rename": "TOMCAT_SESSIONS"
-              }
-            ]
-          }
-        }
       }
     }
   }

diff --git a/translator/config/schema.json b/translator/config/schema.json
@@ -721,15 +721,18 @@
                     ]
                   }
                 },
-                "jmx": {
-                  "$ref": "#/definitions/jmxTargetsDefinition"
+                "enable_jvm": {
+                  "type": "boolean"
                 }
               },
               "tls": {
                 "$ref": "#/definitions/metricsDefinition/definitions/tlsDefinitions"
               },
               "additionalProperties": true
             },
+            "jmx": {
+              "$ref": "#/definitions/jmxTargetsDefinition"
+            },
             "ecs": {
               "type": "object",
               "properties": {
@@ -757,9 +760,6 @@
                 "disable_metric_extraction": {
                   "description": "Disable the extraction of metrics from EMF logs",
                   "type": "boolean"
-                },
-                "jmx": {
-                  "$ref": "#/definitions/jmxTargetsDefinition"
                 }
               },
               "additionalProperties": true