Merge pull request #520 from dynatrace-oss/NOISSUE-fix-cloud_sql-region

NOISSUE-fix-cloud_sql-region
dynatrace-oss · May 31, 2024 · f44dcf6 · f44dcf6
2 parents ae043ff + 47ffba0
commit f44dcf6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/config_logs/google-sql/cloud_sql.json b/src/config_logs/google-sql/cloud_sql.json
@@ -15,6 +15,14 @@
           "key": "gcp.instance.id",
           "pattern": "resource.labels.database_id"
         },
+        {
+          "key": "cloud.region", 
+          "pattern": "resource.labels.region | lower_region(@)"
+        },
+        {
+          "key": "gcp.region", 
+          "pattern": "resource.labels.region | lower_region(@)"
+        },
         {
           "key": "content",
           "pattern": "@"

diff --git a/src/lib/logs/jmespath.py b/src/lib/logs/jmespath.py
@@ -71,7 +71,11 @@ def _func_status_from_proto_code(self, proto_code):
     @functions.signature({'types': ['string']}, {'types': ['string']})
     def _func_split(self, sep, string):
         return string.split(sep)
-
+
+    @functions.signature({'types': ['string']})
+    def _func_lower_region(self, string):
+        return string.lower().replace('_','-')
+
     @functions.signature({'types': ['string']},
                          {'types': ['string']},
                          {'types': ['string']})