From 40764118789f79f79e943a95b805db4e929ec5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 12 Sep 2018 17:18:42 +0200 Subject: Tweak bigclown packages --- bigclown-mqtt2influxdb/Makefile | 28 +++++++++++++++ bigclown-mqtt2influxdb/files/init | 57 ++++++++++++++++++++++++++++++ bigclown-mqtt2influxdb/files/mqtt2influxdb | 9 +++++ 3 files changed, 94 insertions(+) create mode 100644 bigclown-mqtt2influxdb/Makefile create mode 100644 bigclown-mqtt2influxdb/files/init create mode 100755 bigclown-mqtt2influxdb/files/mqtt2influxdb (limited to 'bigclown-mqtt2influxdb') diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile new file mode 100644 index 0000000..760751f --- /dev/null +++ b/bigclown-mqtt2influxdb/Makefile @@ -0,0 +1,28 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=bigclown-mqtt2influxdb +PKG_RELEASE:=1 +PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-mqtt2influxdb.git +PKG_MAINTAINER:=Karel Kočí + +include $(TOPDIR)/package/autopkg-tag.mk +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python3-package.mk) + +define Package/$(PKG_NAME) + TITLE:=BigCLown MQTT to Influxdb bridge + DEPENDS:=+python3 +python3-paho-mqtt +endef + +define Py3Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) ./files/mqtt2influxdb $(1)/usr/bin/mqtt2influxdb +endef + +define Build/Compile + sed -i 's/@@VERSION@@/$(PKG_VERSION)/' "$(PKG_BUILD_DIR)/setup.py" + $(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)) +endef + +$(eval $(call Py3Package,$(PKG_NAME))) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/bigclown-mqtt2influxdb/files/init b/bigclown-mqtt2influxdb/files/init new file mode 100644 index 0000000..f9efc0e --- /dev/null +++ b/bigclown-mqtt2influxdb/files/init @@ -0,0 +1,57 @@ +#!/bin/sh /etc/rc.common + +START=99 +STOP=1 + +USE_PROCD=1 + +PROG=/usr/bin/mqtt2influxdb +CONF=/tmp/etc/bc-mqtt2influxdb.conf + +append() { + local cfg="$1" + local uci_name="$2" + local out_name="$3" + local default="$4" + config_get val $cfg $uci_name $default + if [ -n "$val" ]; then + echo "$out_name $val" >> $CONF + fi +} + +start_service() { + config_load bc-gateway-usb-dongle + + rm -rf $CONF + echo "Generating bc-gateway-usb-dongle config file in $CONF" + + append gateway name 'name:' usb-dongle + append gateway device 'device:' /dev/ttyUSB0 + append gateway automatic_rename_kit_nodes 'automatic_rename_kit_nodes:' 1 + append gateway base_topic_prefix 'base_topic_prefix:' + + echo "mqtt:" >> $CONF + + append mqtt host ' host:' localhost + append mqtt port ' port:' 1883 + append mqtt cafile ' cafile:' + append mqtt certfile ' certfile:' + append mqtt keyfile ' keyfile:' + + procd_open_instance + procd_set_param respawn + procd_set_param command "$PROG" -c "$CONF" --debug + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_close_instance +} + +stop_service() { + service_stop "$PROG" + ps | grep "$PROG" | grep -v grep | sed -e 's/^\s*\([0-9]\+\)\s.*$/\1/' | xargs -r -- kill -9 +} + +service_triggers() +{ + procd_add_reload_trigger 'bc-gateway-usb-dongle' +} diff --git a/bigclown-mqtt2influxdb/files/mqtt2influxdb b/bigclown-mqtt2influxdb/files/mqtt2influxdb new file mode 100755 index 0000000..22f9f8c --- /dev/null +++ b/bigclown-mqtt2influxdb/files/mqtt2influxdb @@ -0,0 +1,9 @@ +#!/usr/bin/python3.6 +import mqtt2influxdb +import sys +from pkg_resources import load_entry_point + +if __name__ == '__main__': + sys.exit( + load_entry_point('mqtt2influxdb', 'console_scripts', 'mqtt2influxdb')() + ) -- cgit v1.2.3 From 799af4541927be9b3b190c0a6d0c97e0bb2fc943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 12 Sep 2018 22:15:18 +0200 Subject: Try to fix more bigclown packages --- bigclown-mqtt2influxdb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bigclown-mqtt2influxdb') diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile index 760751f..678461f 100644 --- a/bigclown-mqtt2influxdb/Makefile +++ b/bigclown-mqtt2influxdb/Makefile @@ -11,7 +11,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=BigCLown MQTT to Influxdb bridge - DEPENDS:=+python3 +python3-paho-mqtt + DEPENDS:=+python3 +python3-paho-mqtt +python3-influxdb endef define Py3Package/$(PKG_NAME)/install -- cgit v1.2.3 From b126c613959c119f6a57123bd921c2a5395767a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 00:32:43 +0200 Subject: Add python3-jsonpath-ng --- bigclown-mqtt2influxdb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bigclown-mqtt2influxdb') diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile index 678461f..d8b6405 100644 --- a/bigclown-mqtt2influxdb/Makefile +++ b/bigclown-mqtt2influxdb/Makefile @@ -11,7 +11,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=BigCLown MQTT to Influxdb bridge - DEPENDS:=+python3 +python3-paho-mqtt +python3-influxdb + DEPENDS:=+python3 +python3-paho-mqtt +python3-influxdb +python3-jsonpath-ng endef define Py3Package/$(PKG_NAME)/install -- cgit v1.2.3 From abd0770f558ba71fbea2f56b44caebce0ae134be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 10:54:43 +0200 Subject: bigclown-mqtt2influxdb: add dependencies --- bigclown-mqtt2influxdb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bigclown-mqtt2influxdb') diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile index d8b6405..0fe33dd 100644 --- a/bigclown-mqtt2influxdb/Makefile +++ b/bigclown-mqtt2influxdb/Makefile @@ -11,7 +11,7 @@ $(call include_mk, python3-package.mk) define Package/$(PKG_NAME) TITLE:=BigCLown MQTT to Influxdb bridge - DEPENDS:=+python3 +python3-paho-mqtt +python3-influxdb +python3-jsonpath-ng + DEPENDS:=+python3 +python3-paho-mqtt +python3-pyyaml +python3-influxdb +python3-jsonpath-ng +python3-schema endef define Py3Package/$(PKG_NAME)/install -- cgit v1.2.3 From a927a28b3ac837ade33929b95268d89a7979ff8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 13 Sep 2018 17:05:35 +0200 Subject: bigclown-mqtt2influxdb: add configuration --- bigclown-mqtt2influxdb/Makefile | 9 ++++- bigclown-mqtt2influxdb/files/config.yml | 60 +++++++++++++++++++++++++++++++++ bigclown-mqtt2influxdb/files/init | 39 ++------------------- 3 files changed, 70 insertions(+), 38 deletions(-) create mode 100644 bigclown-mqtt2influxdb/files/config.yml (limited to 'bigclown-mqtt2influxdb') diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile index 0fe33dd..fd606f0 100644 --- a/bigclown-mqtt2influxdb/Makefile +++ b/bigclown-mqtt2influxdb/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-mqtt2influxdb -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-mqtt2influxdb.git PKG_MAINTAINER:=Karel Kočí @@ -17,6 +17,13 @@ endef define Py3Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) ./files/mqtt2influxdb $(1)/usr/bin/mqtt2influxdb + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/init $(1)/etc/init.d/bc-mqtt2influxdb + $(INSTALL_DATA) ./files/config.yml $(1)/etc/bc-mqtt2influxdb.yml +endef + +define Package/$(PKG_NAME)/conffiles +/etc/bc-mqtt2influxdb.yml endef define Build/Compile diff --git a/bigclown-mqtt2influxdb/files/config.yml b/bigclown-mqtt2influxdb/files/config.yml new file mode 100644 index 0000000..922c1b9 --- /dev/null +++ b/bigclown-mqtt2influxdb/files/config.yml @@ -0,0 +1,60 @@ +mqtt: + host: 127.0.0.1 + port: 1883 + +influxdb: + host: 127.0.0.1 + port: 8086 + database: node + +points: + - measurement: temperature + topic: node/+/thermometer/+/temperature + fields: + value: $.payload + tags: + id: $.topic[1] + channel: $.topic[3] + + - measurement: relative-humidity + topic: node/+/hygrometer/0:4/relative-humidity + fields: + value: $.payload + tags: + id: $.topic[1] + + - measurement: illuminance + topic: node/+/lux-meter/0:0/illuminance + fields: + value: $.payload + tags: + id: $.topic[1] + + - measurement: pressure + topic: node/+/barometer/0:0/pressure + fields: + value: $.payload + tags: + id: $.topic[1] + + - measurement: co2 + topic: node/+/co2-meter/-/concentration + fields: + value: $.payload + tags: + id: $.topic[1] + + - measurement: voltage + topic: node/+/battery/+/voltage + fields: + value: $.payload + tags: + id: $.topic[1] + + - measurement: button + topic: node/+/push-button/+/event-count + fields: + value: $.payload + tags: + id: $.topic[1] + channel: $.topic[3] diff --git a/bigclown-mqtt2influxdb/files/init b/bigclown-mqtt2influxdb/files/init index f9efc0e..76e5d2d 100644 --- a/bigclown-mqtt2influxdb/files/init +++ b/bigclown-mqtt2influxdb/files/init @@ -6,41 +6,12 @@ STOP=1 USE_PROCD=1 PROG=/usr/bin/mqtt2influxdb -CONF=/tmp/etc/bc-mqtt2influxdb.conf - -append() { - local cfg="$1" - local uci_name="$2" - local out_name="$3" - local default="$4" - config_get val $cfg $uci_name $default - if [ -n "$val" ]; then - echo "$out_name $val" >> $CONF - fi -} +CONF=/etc/bc-mqtt2influxdb.yml start_service() { - config_load bc-gateway-usb-dongle - - rm -rf $CONF - echo "Generating bc-gateway-usb-dongle config file in $CONF" - - append gateway name 'name:' usb-dongle - append gateway device 'device:' /dev/ttyUSB0 - append gateway automatic_rename_kit_nodes 'automatic_rename_kit_nodes:' 1 - append gateway base_topic_prefix 'base_topic_prefix:' - - echo "mqtt:" >> $CONF - - append mqtt host ' host:' localhost - append mqtt port ' port:' 1883 - append mqtt cafile ' cafile:' - append mqtt certfile ' certfile:' - append mqtt keyfile ' keyfile:' - procd_open_instance procd_set_param respawn - procd_set_param command "$PROG" -c "$CONF" --debug + procd_set_param command "$PROG" -c "$CONF" procd_set_param stdout 1 procd_set_param stderr 1 procd_close_instance @@ -48,10 +19,4 @@ start_service() { stop_service() { service_stop "$PROG" - ps | grep "$PROG" | grep -v grep | sed -e 's/^\s*\([0-9]\+\)\s.*$/\1/' | xargs -r -- kill -9 -} - -service_triggers() -{ - procd_add_reload_trigger 'bc-gateway-usb-dongle' } -- cgit v1.2.3 From e48d2180906f69009fc830b5a1f5696c6e6ab88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 30 Sep 2018 08:02:09 +0200 Subject: bigclown: configure init script respawn --- bigclown-mqtt2influxdb/Makefile | 2 +- bigclown-mqtt2influxdb/files/init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bigclown-mqtt2influxdb') diff --git a/bigclown-mqtt2influxdb/Makefile b/bigclown-mqtt2influxdb/Makefile index fd606f0..c77bbbe 100644 --- a/bigclown-mqtt2influxdb/Makefile +++ b/bigclown-mqtt2influxdb/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-mqtt2influxdb -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=https://github.com/bigclownlabs/bch-mqtt2influxdb.git PKG_MAINTAINER:=Karel Kočí diff --git a/bigclown-mqtt2influxdb/files/init b/bigclown-mqtt2influxdb/files/init index 76e5d2d..5218205 100644 --- a/bigclown-mqtt2influxdb/files/init +++ b/bigclown-mqtt2influxdb/files/init @@ -10,7 +10,7 @@ CONF=/etc/bc-mqtt2influxdb.yml start_service() { procd_open_instance - procd_set_param respawn + procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} procd_set_param command "$PROG" -c "$CONF" procd_set_param stdout 1 procd_set_param stderr 1 -- cgit v1.2.3