From a8220ab2d293bb7f4b014b79d16b2fb05090fa93 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Feb 2021 12:45:55 +0100 Subject: Adding upstream version 1.29.0. Signed-off-by: Daniel Baumann --- .../system_cpu.conf.alarm_foreach | 8 ++ .../system_cpu.conf.alarm_foreach_sp | 8 ++ .../system_cpu.conf.template_alarm | 26 +++++++ .../system_cpu.conf.template_foreach | 8 ++ .../system_cpu.conf.template_foreach_sp | 8 ++ .../system_cpu.conf.unique_alarm | 26 +++++++ tests/template_dimension/template_dim.sh | 88 ---------------------- 7 files changed, 84 insertions(+), 88 deletions(-) create mode 100644 tests/template_dimension/system_cpu.conf.alarm_foreach create mode 100644 tests/template_dimension/system_cpu.conf.alarm_foreach_sp create mode 100644 tests/template_dimension/system_cpu.conf.template_alarm create mode 100644 tests/template_dimension/system_cpu.conf.template_foreach create mode 100644 tests/template_dimension/system_cpu.conf.template_foreach_sp create mode 100644 tests/template_dimension/system_cpu.conf.unique_alarm delete mode 100644 tests/template_dimension/template_dim.sh (limited to 'tests/template_dimension') diff --git a/tests/template_dimension/system_cpu.conf.alarm_foreach b/tests/template_dimension/system_cpu.conf.alarm_foreach new file mode 100644 index 000000000..21a8cbb72 --- /dev/null +++ b/tests/template_dimension/system_cpu.conf.alarm_foreach @@ -0,0 +1,8 @@ + alarm: dev_dim_template + on: system.cpu + os: linux +lookup: sum -3s at 0 every 3 percentage foreach system,user,nice + units: % + every: 1s + warn: $this > 1 + crit: $this > 4 diff --git a/tests/template_dimension/system_cpu.conf.alarm_foreach_sp b/tests/template_dimension/system_cpu.conf.alarm_foreach_sp new file mode 100644 index 000000000..fdd19e813 --- /dev/null +++ b/tests/template_dimension/system_cpu.conf.alarm_foreach_sp @@ -0,0 +1,8 @@ + alarm: dev_dim_template + on: system.cpu + os: linux +lookup: sum -3s at 0 every 3 percentage foreach * + units: % + every: 1s + warn: $this > 1 + crit: $this > 4 diff --git a/tests/template_dimension/system_cpu.conf.template_alarm b/tests/template_dimension/system_cpu.conf.template_alarm new file mode 100644 index 000000000..2bd12a101 --- /dev/null +++ b/tests/template_dimension/system_cpu.conf.template_alarm @@ -0,0 +1,26 @@ +template: dev_dim_template_system + on: system.cpu + os: linux + lookup: sum -3s at 0 every 3 percentage of system + units: % + every: 1s + warn: $this > 1 + crit: $this > 4 + +template: dev_dim_template_user + on: system.cpu + os: linux + lookup: sum -3s at 0 every 3 percentage of user + units: % + every: 1s + warn: $this > 1 + crit: $this > 4 + +template: dev_dim_template_nice + on: system.cpu + os: linux + lookup: sum -3s at 0 every 3 percentage of nice + units: % + every: 1s + warn: $this > 1 + crit: $this > 4 diff --git a/tests/template_dimension/system_cpu.conf.template_foreach b/tests/template_dimension/system_cpu.conf.template_foreach new file mode 100644 index 000000000..c75c15b2a --- /dev/null +++ b/tests/template_dimension/system_cpu.conf.template_foreach @@ -0,0 +1,8 @@ +template: dev_dim_template + on: system.cpu + os: linux + lookup: sum -3s at 0 every 3 percentage foreach system,user,nice + units: % + every: 1s + warn: $this > 1 + crit: $this > 4 diff --git a/tests/template_dimension/system_cpu.conf.template_foreach_sp b/tests/template_dimension/system_cpu.conf.template_foreach_sp new file mode 100644 index 000000000..f50a832c9 --- /dev/null +++ b/tests/template_dimension/system_cpu.conf.template_foreach_sp @@ -0,0 +1,8 @@ + template: dev_dim_template + on: system.cpu + os: linux + lookup: sum -3s at 0 every 3 percentage foreach * + units: % + every: 1s + warn: $this > 1 + crit: $this > 4 diff --git a/tests/template_dimension/system_cpu.conf.unique_alarm b/tests/template_dimension/system_cpu.conf.unique_alarm new file mode 100644 index 000000000..0f38b6e12 --- /dev/null +++ b/tests/template_dimension/system_cpu.conf.unique_alarm @@ -0,0 +1,26 @@ + alarm: dev_dim_template_system + on: system.cpu + os: linux +lookup: sum -3s at 0 every 3 percentage of system + units: % + every: 1s + warn: $this > 1 + crit: $this > 4 + + alarm: dev_dim_template_user + on: system.cpu + os: linux +lookup: sum -3s at 0 every 3 percentage of user + units: % + every: 1s + warn: $this > 1 + crit: $this > 4 + + alarm: dev_dim_template_nice + on: system.cpu + os: linux +lookup: sum -3s at 0 every 3 percentage of nice + units: % + every: 1s + warn: $this > 1 + crit: $this > 4 diff --git a/tests/template_dimension/template_dim.sh b/tests/template_dimension/template_dim.sh deleted file mode 100644 index f9df48f87..000000000 --- a/tests/template_dimension/template_dim.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -#The health directory to put the alarms -HEALTHDIR="/etc/netdata/health.d/" - -#the current time -OUTDIR="alarms" -QUERY="/api/v1/alarms?all" -MURL="http://localhost:19999$QUERY" - -#error messages -RED='\033[0;31m' -GREEN='\033[0;32m' -NOCOLOR='\033[0m' - -ALARMTEST="dev_dim_template" - -change_alarm_file() { - if [ -f "$1" ]; then - rm "$1" - fi - - #copy keeping the permissions - cp -a "$2" "$3" -} - -netdata_test_download() { - grep "HTTP/1.1 200 OK" "$1" 2>/dev/null 1>/dev/null - TEST="$?" - if [ "$TEST" -ne "0" ]; then - echo -e "${RED} Error to get the alarm log. ${NOCOLOR}" - exit 1 - fi - - TOTALARM=$(grep "$ALARMTEST" "$2" | grep name | cut -d: -f2 | grep -c "$ALARMTEST") - - if [ "$TOTALARM" -ne "$3" ]; then - echo -e "${RED} The number of actives alarms with the name $SYSTEMALARM is wrong ${NOCOLOR}" - exit 1 - fi -} - -get_the_logs() { - curl -v -k --create-dirs -o "$OUTDIR/$1.out" "$MURL" 2> "$OUTDIR/$1.err" - netdata_test_download "$OUTDIR/$1.err" "$OUTDIR/$1.out" "$2" -} - -process_data() { - netdata -D & - NETDATAPID=$! - echo -e "${NOCOLOR}Sleeping during 15 seconds to create alarms" - sleep 15 - kill $NETDATAPID - get_the_logs "$1" "$2" -} - -mkdir "$OUTDIR" -CREATEDIR="$?" -if [ "$CREATEDIR" -ne "0" ]; then - echo -e "${RED}Cannot create the output directory, it already exists. The test will overwrite previous results. ${NOCOLOR}" -fi - -if [ -n "$1" ]; then - MURL="$1$QUERY" -fi - -change_alarm_file "./0" "system_cpu.conf.unique_alarm" "$HEALTHDIR/dim_double_without_template.conf" -process_data "double_without_template" 3 "$HEALTHDIR/dim_double_without_template.conf" - -change_alarm_file "$HEALTHDIR/dim_double_without_template.conf" "system_cpu.conf.alarm_foreach" "$HEALTHDIR/dim_foreach_without_template.conf" -process_data "foreach_without_template" 3 "$HEALTHDIR/dim_foreach_without_template.conf" - -change_alarm_file "$HEALTHDIR/dim_foreach_without_template.conf" "system_cpu.conf.alarm_foreach_sp" "$HEALTHDIR/dim_foreach_without_template_sp.conf" -process_data "foreach_without_template" 10 "$HEALTHDIR/dim_foreach_without_template_sp.conf" - -change_alarm_file "$HEALTHDIR/dim_foreach_without_template_sp.conf" "system_cpu.conf.template_alarm" "$HEALTHDIR/dim_double_with_template.conf" -process_data "double_with_template" 3 "$HEALTHDIR/dim_double_with_template.conf" - -change_alarm_file "$HEALTHDIR/dim_double_with_template.conf" "system_cpu.conf.template_foreach" "$HEALTHDIR/dim_foreach_with_template.conf" -process_data "foreach_with_template" 3 "$HEALTHDIR/dim_foreach_with_template.conf" - -change_alarm_file "$HEALTHDIR/dim_foreach_with_template.conf" "system_cpu.conf.template_foreach_sp" "$HEALTHDIR/dim_foreach_with_template_sp.conf" -process_data "foreach_with_template" 10 "$HEALTHDIR/dim_foreach_with_template_sp.conf" - -rm "$HEALTHDIR/dim_foreach_with_template_sp.conf" -rm -rf "$OUTDIR" - -echo -e "${GREEN} all the tests were sucessful ${NOCOLOR}" -- cgit v1.2.3