fix(metrics): metrics proxy error

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -346,6 +346,10 @@ kubelet_volume_stats_capacity_bytes: [namespace, persistentvolumeclaim, job]
 kubelet_volume_stats_inodes: [namespace, persistentvolumeclaim, job]
 kubelet_volume_stats_inodes_free: [namespace, persistentvolumeclaim, job]
 kubelet_volume_stats_inodes_used: [namespace, persistentvolumeclaim, job]
+istio_requests_total: [source_workload_namespace, reporter, destination_service, response_code, connection_security_policy, source_workload]
+istio_request_duration_milliseconds_bucket: [source_workload_namespace, reporter, destination_service, connection_security_policy, source_workload, le]
+istio_request_bytes_bucket: [source_workload_namespace, reporter, destination_service, connection_security_policy, source_workload, le]
+istio_response_bytes_bucket: [source_workload_namespace, reporter, destination_service, connection_security_policy, source_workload, le]
 {{- end }}
 
 {{/* Generate controller config default reserved name patterns */}}

rootfs/api/tests/test_config.py

@@ -141,7 +141,7 @@ def test_config(self, mock_requests):
         self.assertEqual(response.status_code, 405, response.data)
         return config5
 
-    def test_config_merge_false(self, mock_requests):
+    def test_config_group_merge_false(self, mock_requests):
         """
         Test that config can be created with merge='false' parameter
         which replaces the entire config instead of merging
@@ -159,16 +159,47 @@ def test_config_merge_false(self, mock_requests):
 
         # replace entire config with merge='false'
         value3 = {"name": "NEW_CONFIG", "value": "replacement_value", "group": "global"}
-        body = {'values': [value3]}
+        body = {'values': [value1, value2, value3]}
         response = self.client.post(f"{url}?merge=false", body)
         self.assertEqual(response.status_code, 201, response.data)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200, response.data)
+        self.assertEqual(len(response.data['values']), 3)
 
-        # verify only the new config exists
+        # remove value3
+        body = {'values': [value1, value2]}
+        response = self.client.post(f"{url}?merge=false", body)
+        self.assertEqual(response.status_code, 201, response.data)
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200, response.data)
-        self.assertEqual(len(response.data['values']), 1)
-        self.assertEqual(response.data['values'][0]['name'], "NEW_CONFIG")
-        self.assertEqual(response.data['values'][0]['value'], "replacement_value")
+        self.assertEqual(len(response.data['values']), 2)
+
+    def test_config_ptype_merge_false(self, mock_requests):
+        """
+        Test that config can be created with merge='false' parameter
+        which replaces the entire config instead of merging
+        """
+        app_id = self.create_app()
+
+        # set initial config values
+        url = f"/v2/apps/{app_id}/config"
+        value1 = {"name": "DEBUG", "value": "true", "ptype": "web"}
+        value2 = {"name": "DATABASE_URL", "value": "postgres://localhost/db", "ptype": "web"}
+        value3 = {"name": "NEW_CONFIG", "value": "replacement_value", "ptype": "web"}
+        body = {'values': [value1, value2, value3]}
+        response = self.client.post(f"{url}?merge=false", body)
+        self.assertEqual(response.status_code, 201, response.data)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200, response.data)
+        self.assertEqual(len(response.data['values']), 3)
+
+        # remove value3
+        body = {'values': [value1, value2]}
+        response = self.client.post(f"{url}?merge=false", body)
+        self.assertEqual(response.status_code, 201, response.data)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200, response.data)
+        self.assertEqual(len(response.data['values']), 2)
 
     def test_config_merge_false_with_empty_values(self, mock_requests):
         """

rootfs/api/views.py

@@ -1286,10 +1286,12 @@ async def sample(self, name, labels_str, value):
         fields = set(settings.DRYCC_METRICS_CONFIG[name])
         labels = {}
         for pair in labels_str.strip(" {}").split(','):
+            if '=' not in pair:
+                continue
             k, v = pair.split('=', 1)
             if k in fields:
                 labels[k] = v.strip(' "')
-        app_id = labels.get("namespace", None)
+        app_id = labels.get("namespace", labels.get(settings.DRYCC_METRICS_CONFIG[name][0]))
         if not app_id:
             return None
         account_id, timeout = self.cache.get(app_id, self.default_cache_value)