From e42b41f2640a289ba535d2ebbe15aeb7239392d4 Mon Sep 17 00:00:00 2001 From: Thomas Roehl Date: Tue, 29 Aug 2023 15:39:47 +0200 Subject: [PATCH 1/5] Add safe.directory to Release action --- .github/workflows/Release.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 1d1906b..b7c40d3 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -51,7 +51,9 @@ jobs: - name: RPM build MetricCollector id: rpmbuild - run: make RPM + run: | + git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector + make RPM # AlmaLinux 8.5 is a derivate of RedHat Enterprise Linux 8 (UBI8), # so the created RPM both contain the substring 'el8' in the RPM file names @@ -119,7 +121,9 @@ jobs: - name: RPM build MetricCollector id: rpmbuild - run: make RPM + run: | + git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector + make RPM # See: https://github.com/actions/upload-artifact - name: Save RPM as artifact @@ -168,6 +172,7 @@ jobs: id: dpkg-build run: | export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH + git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector make DEB - name: Rename DEB (add '_ubuntu20.04') id: debrename From b488ff76b1012388122eef359c4ce5f5ba0d7c4c Mon Sep 17 00:00:00 2001 From: Thomas Gruber Date: Tue, 10 Oct 2023 11:54:30 +0200 Subject: [PATCH 2/5] Update natsSink.md --- sinks/natsSink.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sinks/natsSink.md b/sinks/natsSink.md index 7a53f27..24c6ea4 100644 --- a/sinks/natsSink.md +++ b/sinks/natsSink.md @@ -9,20 +9,20 @@ The `nats` sink publishes all metrics into a NATS network. The publishing key is { "": { "type": "nats", - "meta_as_tags" : true, "database" : "mymetrics", "host": "dbhost.example.com", "port": "4222", "user": "exampleuser", - "password" : "examplepw" + "password" : "examplepw", + "meta_as_tags" : [], } } ``` - `type`: makes the sink an `nats` sink -- `meta_as_tags`: print all meta information as tags in the output (optional) - `database`: All metrics are published with this subject - `host`: Hostname of the NATS server - `port`: Portnumber (as string) of the NATS server - `user`: Username for basic authentification -- `password`: Password for basic authentification \ No newline at end of file +- `password`: Password for basic authentification +- `meta_as_tags`: print all meta information as tags in the output (optional) From 262f0c6a8611bb6052026bd5dfccaf044a1a2d1d Mon Sep 17 00:00:00 2001 From: Thomas Gruber Date: Tue, 10 Oct 2023 11:56:02 +0200 Subject: [PATCH 3/5] Update influxSink.md --- sinks/influxSink.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sinks/influxSink.md b/sinks/influxSink.md index 8f9ce83..a4ca193 100644 --- a/sinks/influxSink.md +++ b/sinks/influxSink.md @@ -9,7 +9,6 @@ The `influxdb` sink uses the official [InfluxDB golang client](https://pkg.go.de { "": { "type": "influxdb", - "meta_as_tags" : true, "database" : "mymetrics", "host": "dbhost.example.com", "port": "4222", @@ -18,13 +17,13 @@ The `influxdb` sink uses the official [InfluxDB golang client](https://pkg.go.de "organization": "myorg", "ssl": true, "flush_delay" : "1s", - "batch_size" : 100 + "batch_size" : 100, + "meta_as_tags" : [], } } ``` - `type`: makes the sink an `influxdb` sink -- `meta_as_tags`: print all meta information as tags in the output (optional) - `database`: All metrics are written to this bucket - `host`: Hostname of the InfluxDB database server - `port`: Portnumber (as string) of the InfluxDB database server @@ -34,4 +33,5 @@ The `influxdb` sink uses the official [InfluxDB golang client](https://pkg.go.de - `ssl`: Use SSL connection - `flush_delay`: Group metrics coming in to a single batch - `batch_size`: Maximal batch size +- `meta_as_tags`: move meta information keys to tags (optional) From e76eaa86ad0b60c7f1839ae93f2adcc1bf4692cd Mon Sep 17 00:00:00 2001 From: Thomas Gruber Date: Tue, 10 Oct 2023 11:56:42 +0200 Subject: [PATCH 4/5] Update influxAsyncSink.md --- sinks/influxAsyncSink.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sinks/influxAsyncSink.md b/sinks/influxAsyncSink.md index 951d67d..ddcf4b4 100644 --- a/sinks/influxAsyncSink.md +++ b/sinks/influxAsyncSink.md @@ -9,7 +9,6 @@ The `influxasync` sink uses the official [InfluxDB golang client](https://pkg.go { "": { "type": "influxasync", - "meta_as_tags" : true, "database" : "mymetrics", "host": "dbhost.example.com", "port": "4222", @@ -21,13 +20,13 @@ The `influxasync` sink uses the official [InfluxDB golang client](https://pkg.go "retry_interval" : "1s", "retry_exponential_base" : 2, "max_retries": 20, - "max_retry_time" : "168h" + "max_retry_time" : "168h", + "meta_as_tags" : [], } } ``` - `type`: makes the sink an `influxdb` sink -- `meta_as_tags`: print all meta information as tags in the output (optional) - `database`: All metrics are written to this bucket - `host`: Hostname of the InfluxDB database server - `port`: Portnumber (as string) of the InfluxDB database server @@ -40,5 +39,6 @@ The `influxasync` sink uses the official [InfluxDB golang client](https://pkg.go - `retry_exponential_base`: The retry interval is exponentially increased with this base, default 2 - `max_retries`: Maximal number of retry attempts - `max_retry_time`: Maximal time to retry failed writes, default 168h (one week) +- `meta_as_tags`: move meta information keys to tags (optional) -For information about the calculation of the retry interval settings, see [offical influxdb-client-go documentation](https://github.com/influxdata/influxdb-client-go#handling-of-failed-async-writes) \ No newline at end of file +For information about the calculation of the retry interval settings, see [offical influxdb-client-go documentation](https://github.com/influxdata/influxdb-client-go#handling-of-failed-async-writes) From 9df1054e32e43351f1f78466e9a7e2f777a82a0d Mon Sep 17 00:00:00 2001 From: Thomas Gruber Date: Tue, 10 Oct 2023 11:57:13 +0200 Subject: [PATCH 5/5] Update stdoutSink.md --- sinks/stdoutSink.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sinks/stdoutSink.md b/sinks/stdoutSink.md index 317ca3f..3fe3308 100644 --- a/sinks/stdoutSink.md +++ b/sinks/stdoutSink.md @@ -9,14 +9,14 @@ The `stdout` sink is the most simple sink provided by cc-metric-collector. It wr { "": { "type": "stdout", - "meta_as_tags" : true, + "meta_as_tags" : [], "output_file" : "mylogfile.log" } } ``` - `type`: makes the sink an `stdout` sink -- `meta_as_tags`: print all meta information as tags in the output (optional) +- `meta_as_tags`: print meta information as tags in the output (optional) - `output_file`: Write all data to the selected file (optional). There are two 'special' files: `stdout` and `stderr`. If this option is not provided, the default value is `stdout`