From 6fef63655c95efb95d03a04aa7097f1136899dfc Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Fri, 12 Aug 2022 18:22:01 +0200
Subject: [PATCH] proc ram cpu combined
---
bundles/telegraf/metadata.py | 3 +-
data/grafana/rows/proc_cpu.py | 26 ----------------
data/grafana/rows/proc_cpu_ram.py | 50 +++++++++++++++++++++++++++++++
data/grafana/rows/proc_ram.py | 26 ----------------
4 files changed, 51 insertions(+), 54 deletions(-)
delete mode 100644 data/grafana/rows/proc_cpu.py
create mode 100644 data/grafana/rows/proc_cpu_ram.py
delete mode 100644 data/grafana/rows/proc_ram.py
diff --git a/bundles/telegraf/metadata.py b/bundles/telegraf/metadata.py
index 0d0f887..d406b68 100644
--- a/bundles/telegraf/metadata.py
+++ b/bundles/telegraf/metadata.py
@@ -79,8 +79,7 @@ defaults = {
'disk_io',
'disk_usage',
'net_io',
- 'proc_cpu',
- 'proc_ram',
+ 'proc_cpu_ram',
'proc_io',
},
'sudoers': {
diff --git a/data/grafana/rows/proc_cpu.py b/data/grafana/rows/proc_cpu.py
deleted file mode 100644
index 819914a..0000000
--- a/data/grafana/rows/proc_cpu.py
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- 'process_cpu': {
- 'stacked': True,
- 'queries': {
- 'cpu': {
- 'filters': {
- '_measurement': 'procstat',
- '_field': [
- 'cpu_usage',
- ],
- },
- 'minimum': 0.2,
- },
- },
- 'unit': 'percent',
- 'display_name': '__field.labels.process_name',
- 'legend': {
- 'displayMode': 'table',
- 'placement': 'right',
- 'calcs': [
- 'mean',
- 'max',
- ],
- },
- },
-}
diff --git a/data/grafana/rows/proc_cpu_ram.py b/data/grafana/rows/proc_cpu_ram.py
new file mode 100644
index 0000000..1447b10
--- /dev/null
+++ b/data/grafana/rows/proc_cpu_ram.py
@@ -0,0 +1,50 @@
+{
+ 'cpu': {
+ 'stacked': True,
+ 'queries': {
+ 'cpu': {
+ 'filters': {
+ '_measurement': 'procstat',
+ '_field': [
+ 'cpu_usage',
+ ],
+ },
+ 'minimum': 0.2,
+ },
+ },
+ 'unit': 'percent',
+ 'display_name': '__field.labels.process_name',
+ 'legend': {
+ 'displayMode': 'table',
+ 'placement': 'right',
+ 'calcs': [
+ 'mean',
+ 'max',
+ ],
+ },
+ },
+ 'ram': {
+ 'stacked': True,
+ 'queries': {
+ 'ram': {
+ 'filters': {
+ '_measurement': 'procstat',
+ '_field': [
+ 'memory_rss',
+ ],
+ },
+ 'minimum': 10*(10**6),
+ },
+ },
+ 'unit': 'bytes',
+ 'display_name': '__field.labels.process_name',
+ 'legend': {
+ 'displayMode': 'table',
+ 'placement': 'right',
+ 'calcs': [
+ 'mean',
+ 'max',
+ ],
+ },
+ },
+}
diff --git a/data/grafana/rows/proc_ram.py b/data/grafana/rows/proc_ram.py
deleted file mode 100644
index 32d3ba3..0000000
--- a/data/grafana/rows/proc_ram.py
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- 'process_ram': {
- 'stacked': True,
- 'queries': {
- 'ram': {
- 'filters': {
- '_measurement': 'procstat',
- '_field': [
- 'memory_rss',
- ],
- },
- 'minimum': 10*(10**6),
- },
- },
- 'unit': 'bytes',
- 'display_name': '__field.labels.process_name',
- 'legend': {
- 'displayMode': 'table',
- 'placement': 'right',
- 'calcs': [
- 'mean',
- 'max',
- ],
- },
- },
-}