grafana: fix activities, http_response and influxdb logs

See merge request nexedi/slapos!1693

software/grafana/buildout.hash.cfg

@@ -19,11 +19,11 @@ md5sum = 32c772c593d2c3c38c26186b91b78cf8
 
 [instance-default]
 filename = instance-default.cfg.in
-md5sum = b4330fbe0c9c3631f4f477c06d3460b3
+md5sum = 86e379ac6ba789d65369ca1e0d4dfa3f
 
 [instance-agent]
 filename = instance-agent.cfg.in
-md5sum = 9fc368a3ac16bee297a4f2ad87b3bbb4
+md5sum = 89fd1b010351cea9968360054e0c4aa9
 
 
 [influxdb-config-file]

software/grafana/instance-agent.cfg.in

@@ -214,13 +214,13 @@ init =
                 },
                 {
                   "query": """
-                    select 'message' as cmf_activity_queue, count(*) as failed_message_count
-                      from message where processing_node between -2 and -10
-                    union all select 'message_queue' as cmf_activity_queue, count(*) as failed_message_count
-                      from message_queue where processing_node between -2 and -10
+                    select 'message' as cmf_activity_queue, method_id, count(*) as failed_message_count
+                      from message where processing_node between -10 and -2 group by method_id
+                    union all select 'message_queue' as cmf_activity_queue, method_id, count(*) as failed_message_count
+                      from message_queue where processing_node between -10 and -2 group by method_id
                   """,
                   "field_columns_include": ["failed_message_count"],
-                  "tag_columns_include": ["cmf_activity_queue"],
+                  "tag_columns_include": ["cmf_activity_queue", "method_id"],
                 },
                 # TODO: these queries are slow and maybe not correct
                 # {
@@ -263,7 +263,8 @@ init =
     urls = application.get("urls", [])
     if urls:
       inputs["http_response"].append({
-        "interval": "5m",
+        "interval": "2m",
+        "response_timeout": "1m",
         "urls": urls,
         "tags": {"app": application["name"]},
       })

software/grafana/instance-default.cfg.in

@@ -637,7 +637,7 @@ init =
       "type": "system",
       "partitions": [
         {
-          "name": "grafana",
+          "name": "influxdb",
           "static-tags": {
             "partition_reference": slap_connection['partition-id'],
           },
@@ -646,7 +646,7 @@ init =
           ]
         },
         {
-          "name": "influxdb",
+          "name": "grafana",
           "static-tags": {
             "partition_reference": slap_connection['partition-id'],
           },