diff options
| author | Costa Tsaousis <costa@tsaousis.gr> | 2018-09-17 04:09:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 04:09:35 +0300 |
| commit | ff232c524a5015af629a0b66bdca5bb9949d2781 (patch) | |
| tree | 0a1fc879fa804c870faa603dcda3fca4088aaf91 /conf.d | |
| parent | b9fff3b7b5f2dc1f3aab11bd47e460ce54da755f (diff) | |
send host variables to prometheus (#4200)
* send host variables to prometheus; fixes #4035
* make sure labels do not start with comma
* embed the custom variables scopes into the structures; expose chart variables and the host level
* check the type of variable when streaming host variables
* added URL option variables=yes to enable sending host variables to prometheus; code cleanup to backends
* removed _host_var from variables
* added flags to tag alarm variables; set the last updated time of alarm variables
Diffstat (limited to 'conf.d')
| -rw-r--r-- | conf.d/health.d/ipc.conf | 4 | ||||
| -rw-r--r-- | conf.d/health.d/load.conf | 2 | ||||
| -rw-r--r-- | conf.d/health.d/netfilter.conf | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/conf.d/health.d/ipc.conf b/conf.d/health.d/ipc.conf index 03cf264d8c..989d6e912f 100644 --- a/conf.d/health.d/ipc.conf +++ b/conf.d/health.d/ipc.conf @@ -5,7 +5,7 @@ on: system.ipc_semaphores os: linux hosts: * - calc: $semaphores * 100 / $ipc.semaphores.max + calc: $semaphores * 100 / $ipc_semaphores_max units: % every: 10s warn: $this > (($status >= $WARNING) ? (70) : (80)) @@ -18,7 +18,7 @@ on: system.ipc_semaphore_arrays os: linux hosts: * - calc: $arrays * 100 / $ipc.semaphores.arrays.max + calc: $arrays * 100 / $ipc_semaphores_arrays_max units: % every: 10s warn: $this > (($status >= $WARNING) ? (70) : (80)) diff --git a/conf.d/health.d/load.conf b/conf.d/health.d/load.conf index 0a59522aeb..ee0c54b8e7 100644 --- a/conf.d/health.d/load.conf +++ b/conf.d/health.d/load.conf @@ -8,7 +8,7 @@ on: system.load os: linux hosts: * - calc: ($system.cpu.processors <= 2) ? ( 2 ) : ( $system.cpu.processors ) + calc: ($active_processors == nan or $active_processors == inf or $active_processors < 2) ? ( 2 ) : ( $active_processors ) units: cpus every: 1m info: trigger point for load average alarms diff --git a/conf.d/health.d/netfilter.conf b/conf.d/health.d/netfilter.conf index fa1732b33d..1d07752cc2 100644 --- a/conf.d/health.d/netfilter.conf +++ b/conf.d/health.d/netfilter.conf @@ -19,7 +19,7 @@ os: linux hosts: * lookup: max -10s unaligned of connections - calc: $this * 100 / $netfilter.conntrack.max + calc: $this * 100 / $netfilter_conntrack_max units: % every: 10s warn: $this > (($status >= $WARNING) ? (70) : (80)) |