fixup! grafana split

software/grafana/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = 5a9650b8654b2aeaeab076b08b248b70
 
 [instance-agent]
 filename = instance-agent.cfg.in
-md5sum = edb4eeb900ad13a3b3a6e174c1ea533b
+md5sum = e5a3fe8a90fdbe408384f21a8a2da744
 
 
 [influxdb-config-file]

software/grafana/instance-agent.cfg.in

@@ -255,7 +255,7 @@ init =
               '%{IPORHOST:client_ip} %{NOTSPACE:ident} %{NOTSPACE:auth} \\[%{HTTPDATE:timestamp}\\] "(?:%{WORD:verb:tag} %{NOTSPACE:request}(?: HTTP/%{NUMBER:http_version:float})?|%{DATA})" %{NUMBER:resp_code:tag} (?:%{NUMBER:resp_bytes:int}|-) %{QS:referrer} %{QS:agent} %{NUMBER:response_time:int}'
             ],
             "grok_timezone": "Local",
-            "name_override": "haproxy_logs"
+            "name_override": "haproxy-logs",
             "tags": dict(
               partition.get("static-tags", {}),
               app=application["name"],
@@ -308,13 +308,13 @@ init =
       access_path_dict[f"{application['instance-root']}/sv.sock"] = 'rw'
       telegraf_slapos_input_command = self.options['telegraf-input-slapos-bin']
       inputs["execd"].append({
-        "name_override": "slapos_services",
+        "name_override": "slapos-services",
         "command": [telegraf_slapos_input_command, '-config', telegraf_slapos_input_config_file],
         "tags": {"app": application["name"]},
       })
       # drop measurements for not monitored partitions.
       processors["starlark"].append({
-        "namepass": ["slapos_services"],
+        "namepass": ["slapos-services"],
         "order": 1,
         "source": f'''
   def apply(metric):
@@ -327,7 +327,7 @@ init =
       # context and because we use the name of the partition as "name" everywhere
       # else.
       processors["rename"].append({
-        "namepass": ["slapos_services"],
+        "namepass": ["slapos-services"],
         "order": 2,
         "replace": [{
           "tag": "name",
@@ -335,7 +335,7 @@ init =
         }]})
       # "normalize" slapos process names, remove hash from hash-files and -on-watch suffix
       processors["regex"].append({
-        "namepass": ["slapos_services"],
+        "namepass": ["slapos-services"],
         "order": 3,
         "tags": [{
           "key": "process_name",
@@ -343,7 +343,7 @@ init =
           "replacement": "$" + "{1}",
         }]})
       processors["regex"].append({
-        "namepass": ["slapos_services"],
+        "namepass": ["slapos-services"],
         "order": 4,
         "tags": [{
           "key": "process_name",
@@ -353,14 +353,14 @@ init =
         }]})
       # use consistent `partition_reference` for slappart
       processors["rename"].append({
-        "namepass": ["slapos_services"],
+        "namepass": ["slapos-services"],
         "order": 5,
         "replace": [{
           "tag": "reference",
           "dest": "partition_reference",
         }]})
       processors["enum"].append({
-        "namepass": ["slapos_services"],
+        "namepass": ["slapos-services"],
         "order": 6,
         "mapping": [{
           "tag": "partition_reference",