diff options
| author | Lukasz Woznicki <75632179+makr11st@users.noreply.github.com> | 2021-07-06 14:25:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 14:25:23 +0100 |
| commit | b35efa7692fc9d04a7ec43390e04adf5ed71100d (patch) | |
| tree | e7c7216d516cfa11366ea15c980a0f5b784a0ff6 /configuration | |
| parent | 8bc81842f61a0f3605e5a9a1b28c6a36300b2040 (diff) | |
[CIT-380] Integrate collectd_mapper with tedge_mapper (#320)
* Move collectd_mapper to tedge_mapper
* Add tedge-mapper-collectd service
* Rename cli arg from dm to collectd
Signed-off-by: Lukasz Woznicki <lukasz.woznicki@softwareag.com>
Diffstat (limited to 'configuration')
| -rw-r--r-- | configuration/contrib/collectd/collectd.conf | 2 | ||||
| -rw-r--r-- | configuration/debian/collectd_mapper/postinst | 15 | ||||
| -rw-r--r-- | configuration/init/systemd/collectd-mapper.service | 12 | ||||
| -rw-r--r-- | configuration/init/systemd/tedge-mapper-collectd.service | 12 |
4 files changed, 13 insertions, 28 deletions
diff --git a/configuration/contrib/collectd/collectd.conf b/configuration/contrib/collectd/collectd.conf index 76f65b1d..a623d39e 100644 --- a/configuration/contrib/collectd/collectd.conf +++ b/configuration/contrib/collectd/collectd.conf @@ -809,7 +809,7 @@ LoadPlugin mqtt <Publish "name"> Host "localhost" Port 1883 - ClientId "tedge-dm" + ClientId "tedge-collectd" # User "user" # Password "secret" # QoS 0 diff --git a/configuration/debian/collectd_mapper/postinst b/configuration/debian/collectd_mapper/postinst deleted file mode 100644 index 1d37401a..00000000 --- a/configuration/debian/collectd_mapper/postinst +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -# Create a group "collectd-mapper" if not created before -if ! getent group collectd-mapper > /dev/null; then - addgroup --quiet --system collectd-mapper -fi - -# Create a user "collectd-mapper" if not created before -if ! getent passwd collectd-mapper > /dev/null; then - adduser --quiet --system --no-create-home --ingroup collectd-mapper --shell /usr/sbin/nologin collectd-mapper -fi - -#DEBHELPER# diff --git a/configuration/init/systemd/collectd-mapper.service b/configuration/init/systemd/collectd-mapper.service deleted file mode 100644 index 50341d8a..00000000 --- a/configuration/init/systemd/collectd-mapper.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=collectd-mapper collects device monitoring measurements and converts them to connectivity provider format. -After=syslog.target network.target mosquitto.service - -[Service] -User=collectd-mapper -ExecStart=/usr/bin/collectd_mapper -Restart=on-failure -RestartPreventExitStatus=255 - -[Install] -WantedBy=multi-user.target diff --git a/configuration/init/systemd/tedge-mapper-collectd.service b/configuration/init/systemd/tedge-mapper-collectd.service new file mode 100644 index 00000000..0499c3c9 --- /dev/null +++ b/configuration/init/systemd/tedge-mapper-collectd.service @@ -0,0 +1,12 @@ +[Unit] +Description=tedge-mapper-collectd converts Thin Edge JSON measurements to Cumulocity JSON format. +After=syslog.target network.target mosquitto.service + +[Service] +User=tedge-mapper +ExecStart=/usr/bin/tedge_mapper collectd +Restart=on-failure +RestartPreventExitStatus=255 + +[Install] +WantedBy=multi-user.target |