software/grafana: collect method_id of failed erp5 activities

software/grafana/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = 86e379ac6ba789d65369ca1e0d4dfa3f
 
 [instance-agent]
 filename = instance-agent.cfg.in
-md5sum = a6f13d73732f4c1f34787c63ed9a7e8d
+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 -10 and -2
-                    union all select 'message_queue' as cmf_activity_queue, count(*) as failed_message_count
-                      from message_queue where processing_node between -10 and -2
+                    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
                 # {