From 051eef5bbff7ebb0f6dff061ed1bd26a890afa09 Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Sun, 14 Apr 2024 13:40:26 +0200 Subject: [PATCH] services: Remove mqtt-graphite --- roles/services/handlers/main.yaml | 6 ----- roles/services/tasks/main.yaml | 3 --- roles/services/tasks/mqtt_graphite.yaml | 25 ------------------- .../services/templates/mqtt-graphite.service | 15 ----------- roles/services/templates/mqtt-graphite.sh | 20 --------------- 5 files changed, 69 deletions(-) delete mode 100644 roles/services/tasks/mqtt_graphite.yaml delete mode 100644 roles/services/templates/mqtt-graphite.service delete mode 100644 roles/services/templates/mqtt-graphite.sh diff --git a/roles/services/handlers/main.yaml b/roles/services/handlers/main.yaml index 3c62a74..c51b7bf 100644 --- a/roles/services/handlers/main.yaml +++ b/roles/services/handlers/main.yaml @@ -43,12 +43,6 @@ state: restarted daemon_reload: true -- name: restart mqtt-graphite - systemd: - name: mqtt-graphite - state: restarted - daemon_reload: true - - name: restart wifi-mqtt systemd: name: wifi-mqtt diff --git a/roles/services/tasks/main.yaml b/roles/services/tasks/main.yaml index 6cdbbdc..3cc006d 100644 --- a/roles/services/tasks/main.yaml +++ b/roles/services/tasks/main.yaml @@ -14,9 +14,6 @@ - tags: services_mastodon_spacestate import_tasks: mastodon_spacestate.yaml -- tags: services_mqtt_graphite - import_tasks: mqtt_graphite.yaml - - tags: services_wifi_mqtt import_tasks: wifi_mqtt.yaml diff --git a/roles/services/tasks/mqtt_graphite.yaml b/roles/services/tasks/mqtt_graphite.yaml deleted file mode 100644 index bbb36f9..0000000 --- a/roles/services/tasks/mqtt_graphite.yaml +++ /dev/null @@ -1,25 +0,0 @@ -- name: Install mqtt-graphite - template: - src: mqtt-graphite.sh - dest: /var/lib/mqtt-graphite.sh - owner: root - group: root - mode: 0755 - notify: restart mqtt-graphite - -- name: Install mqtt-graphite service - template: - src: mqtt-graphite.service - dest: /etc/systemd/system/mqtt-graphite.service - owner: root - group: root - mode: 0644 - notify: restart mqtt-graphite - -- name: Start mqtt-graphite - systemd: - name: mqtt-graphite - state: started - enabled: yes - daemon_reload: true - diff --git a/roles/services/templates/mqtt-graphite.service b/roles/services/templates/mqtt-graphite.service deleted file mode 100644 index 5ec8a09..0000000 --- a/roles/services/templates/mqtt-graphite.service +++ /dev/null @@ -1,15 +0,0 @@ -# Managed by Ansible - -[Unit] -Description=MQTT to Graphite bridge -After=network.target - -[Service] -Type=simple -ExecStart=/bin/bash /var/lib/mqtt-graphite.sh -Restart=on-failure -RestartSec=10s -DynamicUser=true - -[Install] -WantedBy=multi-user.target diff --git a/roles/services/templates/mqtt-graphite.sh b/roles/services/templates/mqtt-graphite.sh deleted file mode 100644 index b05c973..0000000 --- a/roles/services/templates/mqtt-graphite.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -GRAPHITE_HOST="100.64.0.11" -GRAPHITE_PORT="2003" - -set -eu -set -o pipefail - -mqtt-simple -h {{ mqtt_internal_host }} -t "#" | - while read line; do - topic=$(echo "$line" | cut -d' ' -f1 | sed 's/\//./g' | tr '[:upper:]' '[:lower:]') - value=$(echo "$line" | cut -s -d' ' -f2- | sed 's/closed/0/g;s/open/1/g') - - # Only relay numeric values. - if [[ $value =~ ^-?[0-9]+\.?[0-9]*$ ]]; then - echo "$topic $value $(date +%s)" | nc -q0 "$GRAPHITE_HOST" "$GRAPHITE_PORT" - echo "$topic $value $(date +%s)" - fi - done -