diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_dev_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_dev_defconfig index b1247641..561b881f 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_dev_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_dev_defconfig @@ -77,4 +77,5 @@ BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION="5.1" BR2_PACKAGE_LUA_EDITING_NONE=y BR2_PACKAGE_HAS_LUAINTERPRETER=y BR2_PACKAGE_LUASOCKET=y +BR2_PACKAGE_LUA_CJSON=y BR2_PACKAGE_NODE_EXPORTER=y diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_dev_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_dev_defconfig index 8ed2991a..01d94196 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_dev_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_dev_defconfig @@ -91,4 +91,5 @@ BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION="5.1" BR2_PACKAGE_LUA_EDITING_NONE=y BR2_PACKAGE_HAS_LUAINTERPRETER=y BR2_PACKAGE_LUASOCKET=y +BR2_PACKAGE_LUA_CJSON=y BR2_PACKAGE_NODE_EXPORTER=y diff --git a/general/package/node-exporter/files/script/S95prometheus b/general/package/node-exporter/files/script/S99node-exporter similarity index 76% rename from general/package/node-exporter/files/script/S95prometheus rename to general/package/node-exporter/files/script/S99node-exporter index f9e9d1f7..be597a58 100755 --- a/general/package/node-exporter/files/script/S95prometheus +++ b/general/package/node-exporter/files/script/S99node-exporter @@ -1,21 +1,21 @@ #!/bin/sh -DAEMON="prometheus-node-exporter-lua" +DAEMON="node-exporter" PIDFILE="/var/run/$DAEMON.pid" -PROMETHEUS_ARGS="--bind * --port 9100" +NODE_EXPORTER_ARGS="--bind 0.0.0.0 --port 9100" # shellcheck source=/dev/null [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" -# The majestic does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. +# The node-exporter does not create a pidfile, and use "-m" to instruct start-stop-daemon to create one. start() { - logger -s -p daemon.info -t prometheus "Start $DAEMON" + logger -s -p daemon.info -t node-exporter "Start $DAEMON" # printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ - -- $PROMETHEUS_ARGS + -- $NODE_EXPORTER_ARGS status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/general/package/node-exporter/files/script/prometheus-node-exporter-lua b/general/package/node-exporter/files/script/node-exporter similarity index 100% rename from general/package/node-exporter/files/script/prometheus-node-exporter-lua rename to general/package/node-exporter/files/script/node-exporter diff --git a/general/package/node-exporter/node-exporter.mk b/general/package/node-exporter/node-exporter.mk index e68d56e5..4444d93b 100644 --- a/general/package/node-exporter/node-exporter.mk +++ b/general/package/node-exporter/node-exporter.mk @@ -13,10 +13,10 @@ NODE_EXPORTER_INSTALL_STAGING = YES define NODE_EXPORTER_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d - $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(TOPDIR)/../general/package/node-exporter/files/script/S95prometheus + $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(TOPDIR)/../general/package/node-exporter/files/script/S99node-exporter $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(TOPDIR)/../general/package/node-exporter/files/script/prometheus-node-exporter-lua + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(TOPDIR)/../general/package/node-exporter/files/script/node-exporter $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/lua/5.1/prometheus-collectors $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/lua/5.1/prometheus-collectors $(TOPDIR)/../general/package/node-exporter/files/prometheus-collectors/*.lua