From f83a342e288b1c156aaa8aa428ce1868a74fef6f Mon Sep 17 00:00:00 2001 From: Thomas Roehl Date: Sat, 21 Dec 2024 18:11:22 +0100 Subject: [PATCH 1/2] Remove test CI configuration --- .github/ci-collectors.json | 6 ------ .github/ci-config.json | 8 -------- .github/ci-receivers.json | 1 - .github/ci-router.json | 37 ------------------------------------- .github/ci-sinks.json | 8 -------- 5 files changed, 60 deletions(-) delete mode 100644 .github/ci-collectors.json delete mode 100644 .github/ci-config.json delete mode 100644 .github/ci-receivers.json delete mode 100644 .github/ci-router.json delete mode 100644 .github/ci-sinks.json diff --git a/.github/ci-collectors.json b/.github/ci-collectors.json deleted file mode 100644 index 3497fc0..0000000 --- a/.github/ci-collectors.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "tempstat": {}, - "diskstat": {}, - "memstat": {}, - "cpustat": {} -} diff --git a/.github/ci-config.json b/.github/ci-config.json deleted file mode 100644 index 1c4ba97..0000000 --- a/.github/ci-config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "sinks": ".github/ci-sinks.json", - "collectors" : ".github/ci-collectors.json", - "receivers" : ".github/ci-receivers.json", - "router" : ".github/ci-router.json", - "interval": "5s", - "duration": "1s" -} diff --git a/.github/ci-receivers.json b/.github/ci-receivers.json deleted file mode 100644 index 0967ef4..0000000 --- a/.github/ci-receivers.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/.github/ci-router.json b/.github/ci-router.json deleted file mode 100644 index 0146768..0000000 --- a/.github/ci-router.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "add_tags": [ - { - "key": "cluster", - "value": "testcluster", - "if": "*" - }, - { - "key": "test", - "value": "testing", - "if": "name == 'temp_package_id_0'" - } - ], - "delete_tags": [ - { - "key": "unit", - "value": "*", - "if": "*" - } - ], - "interval_aggregates": [ - { - "name": "temp_cores_avg", - "function": "avg(values)", - "if": "match('temp_core_%d+', metric.Name())", - "tags": { - "type": "node" - }, - "meta": { - "group": "", - "unit": "", - "source": "MetricAggregator" - } - } - ], - "interval_timestamp": true -} diff --git a/.github/ci-sinks.json b/.github/ci-sinks.json deleted file mode 100644 index 2b78305..0000000 --- a/.github/ci-sinks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "testoutput" : { - "type" : "stdout", - "meta_as_tags" : [ - "unit" - ] - } -} From d15eba8fe89b1031bd889a1d78b1470b59c47a66 Mon Sep 17 00:00:00 2001 From: Thomas Roehl Date: Sat, 21 Dec 2024 18:12:54 +0100 Subject: [PATCH 2/2] Re-add test configuration files with changed permissions --- .github/ci-collectors.json | 6 ++++++ .github/ci-config.json | 8 ++++++++ .github/ci-receivers.json | 1 + .github/ci-router.json | 37 +++++++++++++++++++++++++++++++++++++ .github/ci-sinks.json | 8 ++++++++ 5 files changed, 60 insertions(+) create mode 100644 .github/ci-collectors.json create mode 100644 .github/ci-config.json create mode 100644 .github/ci-receivers.json create mode 100644 .github/ci-router.json create mode 100644 .github/ci-sinks.json diff --git a/.github/ci-collectors.json b/.github/ci-collectors.json new file mode 100644 index 0000000..3497fc0 --- /dev/null +++ b/.github/ci-collectors.json @@ -0,0 +1,6 @@ +{ + "tempstat": {}, + "diskstat": {}, + "memstat": {}, + "cpustat": {} +} diff --git a/.github/ci-config.json b/.github/ci-config.json new file mode 100644 index 0000000..1c4ba97 --- /dev/null +++ b/.github/ci-config.json @@ -0,0 +1,8 @@ +{ + "sinks": ".github/ci-sinks.json", + "collectors" : ".github/ci-collectors.json", + "receivers" : ".github/ci-receivers.json", + "router" : ".github/ci-router.json", + "interval": "5s", + "duration": "1s" +} diff --git a/.github/ci-receivers.json b/.github/ci-receivers.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/.github/ci-receivers.json @@ -0,0 +1 @@ +{} diff --git a/.github/ci-router.json b/.github/ci-router.json new file mode 100644 index 0000000..0146768 --- /dev/null +++ b/.github/ci-router.json @@ -0,0 +1,37 @@ +{ + "add_tags": [ + { + "key": "cluster", + "value": "testcluster", + "if": "*" + }, + { + "key": "test", + "value": "testing", + "if": "name == 'temp_package_id_0'" + } + ], + "delete_tags": [ + { + "key": "unit", + "value": "*", + "if": "*" + } + ], + "interval_aggregates": [ + { + "name": "temp_cores_avg", + "function": "avg(values)", + "if": "match('temp_core_%d+', metric.Name())", + "tags": { + "type": "node" + }, + "meta": { + "group": "", + "unit": "", + "source": "MetricAggregator" + } + } + ], + "interval_timestamp": true +} diff --git a/.github/ci-sinks.json b/.github/ci-sinks.json new file mode 100644 index 0000000..2b78305 --- /dev/null +++ b/.github/ci-sinks.json @@ -0,0 +1,8 @@ +{ + "testoutput" : { + "type" : "stdout", + "meta_as_tags" : [ + "unit" + ] + } +}