From f4518e5375ca9a21a97ebd3358a781839f3432cc Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Fri, 7 Feb 2020 11:30:36 +0100 Subject: [PATCH] Change name of executable from "munin-node" to "muninlite" Previously MuninLite tried to create a drop-in-replacement for munin-node by using the same name. But MuninLite behaves differently and may even be used in parallel to a regular munin-node setup on a host, thus it should use a distinct name. --- .gitignore | 2 +- Makefile | 8 ++++---- README.md | 16 ++++++++-------- examples/hosts.allow | 2 +- examples/hosts.deny | 2 +- examples/inetd.busybox | 2 +- examples/inetd.conf | 2 +- examples/post-muninlite.ini | 2 +- examples/xinetd.d/munin | 2 +- munin-node.conf => muninlite.conf | 0 munin-node.in => muninlite.in | 0 11 files changed, 19 insertions(+), 19 deletions(-) rename munin-node.conf => muninlite.conf (100%) rename munin-node.in => muninlite.in (100%) diff --git a/.gitignore b/.gitignore index 86706d5..1f36db7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -munin-node +muninlite releases/ diff --git a/Makefile b/Makefile index b683b66..09a1cb4 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ PLUGINS ?= df cpu if_ if_err_ load memory processes swap netstat uptime interrupts irqstats ntpdate plugindir_ -CONFIGURATION_FILE ?= munin-node.conf -INPUT_FILE ?= munin-node.in -TARGET_FILE ?= munin-node +CONFIGURATION_FILE ?= muninlite.conf +INPUT_FILE ?= muninlite.in +TARGET_FILE ?= muninlite PLUGIN_DIRECTORY ?= plugins PLUGIN_FILES = $(patsubst %,$(PLUGIN_DIRECTORY)/%,$(PLUGINS)) VERSION ?= $(shell cat VERSION) @@ -11,7 +11,7 @@ TGZ_FILE ?= $(DIST_DIR)/muninlite-$(VERSION).tar.gz $(TARGET_FILE): $(INPUT_FILE) $(PLUGIN_FILES) $(CONFIGURATION_FILE) - @echo "Making munin-node for muninlite version $$VERSION" + @echo "Making muninlite version $$VERSION" @for plugin_filename in $(PLUGIN_FILES); do \ echo "Adding plugin $$(basename "$$plugin_filename")"; done @export VERSION="$(VERSION)"; \ diff --git a/README.md b/README.md index 7d63798..1e4e3a5 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Installation ------------ Download source and unpack it. -Assemble the munin-node shell script by running `make`: +Assemble the MuninLite shell script by running `make`: ```shell $ make ``` @@ -55,7 +55,7 @@ You may assemble a reduced script by including only specific plugins: $ make PLUGINS="cpu load uptime" ``` -Run `make install` or simply copy `munin-node` to a suitable location. +Run `make install` or simply copy `muninlite` to a suitable location. ```shell make install @@ -76,7 +76,7 @@ Configure the `address` setting of the node in the master's configuration with a suitable transport, e.g.: ``` [some.host.tld] - address ssh://node-a.example.org/usr/local/bin/munin-node + address ssh://node-a.example.org/usr/local/bin/muninlite ``` The above example causes the master to connect to the node via ssh and to @@ -119,9 +119,9 @@ iptables -A INPUT -p tcp --dport munin --source 10.42.42.25 -j ACCEPT Test ---- -To test the script, just run it (`/usr/bin/local/munin-node`): +To test the script, just run it (`/usr/bin/local/muninlite`): ```shell -$ /usr/local/bin/munin-node +$ /usr/local/bin/muninlite # munin node at localhost.localdomain help # Unknown command. Try list, nodes, config, fetch, version or quit @@ -153,14 +153,14 @@ Connection closed by foreign host. Plugin configuration -------------------- To configure which plugins should be enabled, locate the `PLUGINS` -variable in munin-node and remove unwanted plugins. +variable in `muninlite` and remove unwanted plugins. There is no specific configuration for plugins. Munin configuration ------------------- Configure your /etc/munin/munin.conf as you would for a regular -`munin-node`, if you configured MuninLite as a TCP service (e.g. via +`muninnode`, if you configured MuninLite as a TCP service (e.g. via inetd/xinetd): ``` @@ -173,6 +173,6 @@ In case of direct execution of MuninLite on the remote host (without a TCP service), you need to configure a transport and execute the script directly: ``` [some.host.tld] - address ssh://10.42.42.25/usr/local/bin/munin-node + address ssh://10.42.42.25/usr/local/bin/muninlite use_node_name yes ``` diff --git a/examples/hosts.allow b/examples/hosts.allow index fdd1dbf..74380ed 100644 --- a/examples/hosts.allow +++ b/examples/hosts.allow @@ -1 +1 @@ -munin-node : 10.42.42.25 +muninlite : 10.42.42.25 diff --git a/examples/hosts.deny b/examples/hosts.deny index 6246f52..dc91cbd 100644 --- a/examples/hosts.deny +++ b/examples/hosts.deny @@ -1 +1 @@ -munin-node : ALL +muninlite : ALL diff --git a/examples/inetd.busybox b/examples/inetd.busybox index d0b5009..bc3ea26 100644 --- a/examples/inetd.busybox +++ b/examples/inetd.busybox @@ -1 +1 @@ -munin stream tcp nowait root /usr/local/bin/munin-node +munin stream tcp nowait root /usr/local/bin/muninlite diff --git a/examples/inetd.conf b/examples/inetd.conf index a587d9b..fd717aa 100644 --- a/examples/inetd.conf +++ b/examples/inetd.conf @@ -1 +1 @@ -munin stream tcp nowait root /usr/sbin/tcpd /usr/local/bin/munin-node +munin stream tcp nowait root /usr/sbin/tcpd /usr/local/bin/muninlite diff --git a/examples/post-muninlite.ini b/examples/post-muninlite.ini index a419a13..f255a5d 100644 --- a/examples/post-muninlite.ini +++ b/examples/post-muninlite.ini @@ -26,7 +26,7 @@ if [ -f /sbin/inetd ]; then echo "muninlite can not start as lrrd is already in use" exit 1 else - echo "lrrd stream tcp nowait root /usr/bin/munin-node" >> /etc/inetd.conf + echo "lrrd stream tcp nowait root /usr/bin/muninlite" >> /etc/inetd.conf fi PID=$(ps | grep -v grep | grep inetd | sed 's/^ \{1,\}//' | cut -d\ -f1) if [ ! -z "$PID" ]; then diff --git a/examples/xinetd.d/munin b/examples/xinetd.d/munin index 1d01f67..7db0c36 100644 --- a/examples/xinetd.d/munin +++ b/examples/xinetd.d/munin @@ -6,6 +6,6 @@ service munin user = root group = root only_from = 10.42.42.25 - server = /usr/local/bin/munin-node + server = /usr/local/bin/muninlite disable = no } diff --git a/munin-node.conf b/muninlite.conf similarity index 100% rename from munin-node.conf rename to muninlite.conf diff --git a/munin-node.in b/muninlite.in similarity index 100% rename from munin-node.in rename to muninlite.in