overview: Fix job -> service

pull/157/head
Mike Lang 5 years ago
parent e1993c6a79
commit 9a1369cf98

@ -59,7 +59,7 @@ local service_status_table = {
thresholds: [], thresholds: [],
mappingType: 1, mappingType: 1,
} }
for name in ["__name__", "job", "Time"] for name in ["__name__", "service", "Time"]
] + [ ] + [
// service cols // service cols
{ {
@ -123,8 +123,8 @@ grafana.dashboard({
axis: {min: 0, label: "logs / sec"}, axis: {min: 0, label: "logs / sec"},
display: "bars", display: "bars",
expressions: { expressions: {
"{{instance}} {{job}} {{level}}({{module}}:{{function}})": ||| "{{instance}} {{service}} {{level}}({{module}}:{{function}})": |||
sum(irate(log_count_total{level!="INFO"}[2m])) by (instance, job, level, module, function) > 0 sum(irate(log_count_total{level!="INFO"}[2m])) by (instance, service, level, module, function) > 0
|||, |||,
}, },
}, },
@ -167,8 +167,8 @@ grafana.dashboard({
name: "CPU usage", name: "CPU usage",
axis: {min: 0, label: "cores", format: grafana.formats.percent}, axis: {min: 0, label: "cores", format: grafana.formats.percent},
expressions: { expressions: {
"{{instance}} {{job}}": ||| "{{instance}} {{service}}": |||
sum by (instance, job) ( sum by (instance, service) (
rate(process_cpu_seconds_total[2m]) rate(process_cpu_seconds_total[2m])
) )
||| |||
@ -178,7 +178,7 @@ grafana.dashboard({
name: "Memory usage (RSS)", name: "Memory usage (RSS)",
axis: {min: 0, format: grafana.formats.bytes}, axis: {min: 0, format: grafana.formats.bytes},
expressions: { expressions: {
"{{instance}} {{job}}": "process_resident_memory_bytes", "{{instance}} {{service}}": "process_resident_memory_bytes",
}, },
}, },
{ {
@ -186,7 +186,7 @@ grafana.dashboard({
axis: {min: 0, label: "restarts within last minute"}, axis: {min: 0, label: "restarts within last minute"},
tooltip: "Multiple restarts within 15sec will be missed, and only counted as one.", tooltip: "Multiple restarts within 15sec will be missed, and only counted as one.",
expressions: { expressions: {
"{{instance}} {{job}}": "changes(process_start_time_seconds[1m])", "{{instance}} {{service}}": "changes(process_start_time_seconds[1m])",
}, },
}, },
], ],

Loading…
Cancel
Save