committing changes in /etc made by "apt-get install icingaweb2-module-graphite graphi...

Package changes:
+graphite-api 1.1.3-5 all
+icingaweb2-module-graphite 1.1.0-1 all
+libjs-modernizr 2.6.2+ds1-3ubuntu1 all
+python3-blinker 1.4+dfsg1-0.3ubuntu1 all
+python3-flask 1.1.1-2 all
+python3-itsdangerous 1.1.0-1 all
+python3-jinja2 2.10.1-2 all
+python3-markupsafe 1.1.0-1build2 amd64
+python3-structlog 18.1.0-2 all
+python3-tzlocal 2.1~b1-2 all
+python3-werkzeug 0.16.1+dfsg1-2 all
+sphinx-rtd-theme-common 0.4.3+dfsg-3 all

diff --git a/.etckeeper b/.etckeeper
index 3f10234dcc1b0121b357466a29132ea3d7170317..730c8f9fa4bf10eadef433ad9e62c439f8ada35b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -888,6 +888,7 @@ maybe chmod 0644 'default/cron'
 maybe chmod 0644 'default/dbus'
 maybe chmod 0644 'default/dovecot'
 maybe chmod 0644 'default/fail2ban'
+maybe chmod 0644 'default/graphite-api'
 maybe chmod 0644 'default/graphite-carbon'
 maybe chmod 0644 'default/grub'
 maybe chmod 0755 'default/grub.d'
@@ -1252,6 +1253,7 @@ maybe chmod 0644 'ghostscript/cidfmap.d/90gs-cjk-resource-korea1.conf'
 maybe chmod 0755 'ghostscript/fontmap.d'
 maybe chmod 0644 'ghostscript/fontmap.d/10gsfonts.conf'
 maybe chmod 0755 'graphite'
+maybe chmod 0644 'graphite-api.yaml'
 maybe chmod 0755 'graphite/__pycache__'
 maybe chmod 0644 'graphite/local_settings.py'
 maybe chmod 0755 'groff'
@@ -1495,6 +1497,7 @@ maybe chmod 0755 'init.d/cron'
 maybe chmod 0755 'init.d/dbus'
 maybe chmod 0755 'init.d/dovecot'
 maybe chmod 0755 'init.d/fail2ban'
+maybe chmod 0755 'init.d/graphite-api'
 maybe chmod 0755 'init.d/grub-common'
 maybe chmod 0755 'init.d/hwclock.sh'
 maybe chmod 0755 'init.d/icinga2'
@@ -8779,6 +8782,7 @@ maybe chmod 0644 'logrotate.d/certbot'
 maybe chmod 0644 'logrotate.d/dbconfig-common'
 maybe chmod 0644 'logrotate.d/dpkg'
 maybe chmod 0644 'logrotate.d/fail2ban'
+maybe chmod 0644 'logrotate.d/graphite-api'
 maybe chmod 0644 'logrotate.d/graphite-carbon'
 maybe chmod 0644 'logrotate.d/graphite-web'
 maybe chmod 0644 'logrotate.d/icinga2'

diff --git a/default/graphite-api b/default/graphite-api
new file mode 100644 (file)
index 0000000..f03114c
--- /dev/null
+++ b/default/graphite-api
@@ -0,0 +1,9 @@
+# This file is not used when using systemd.
+# Use "systemctl edit graphite-api" instead.
+
+# IP address and TCP port to listen. Can be a Unix socket too (eg
+# unix:/var/run/graphite-api/gunicorn.sock)
+DAEMON_ARGS="--bind=127.0.0.1:8542 $DAEMON_ARGS"
+
+# Number of workers to use
+DAEMON_ARGS="--workers=1 $DAEMON_ARGS"

diff --git a/graphite-api.yaml b/graphite-api.yaml
new file mode 100644 (file)
index 0000000..9b66cf2
--- /dev/null
+++ b/graphite-api.yaml
@@ -0,0 +1,4 @@
+search_index: /var/lib/graphite-api/index
+whisper:
+  directories:
+    - /var/lib/graphite/whisper

diff --git a/icingweb2/enabledModules/graphite b/icingweb2/enabledModules/graphite
new file mode 120000 (symlink)
index 0000000..798361d
--- /dev/null
+++ b/icingweb2/enabledModules/graphite
@@ -0,0 +1 @@
+/usr/share/icingaweb2/modules/graphite
\ No newline at end of file

diff --git a/init.d/graphite-api b/init.d/graphite-api
new file mode 100755 (executable)
index 0000000..d8cf89c
--- /dev/null
+++ b/init.d/graphite-api
@@ -0,0 +1,37 @@
+#!/bin/sh
+# kFreeBSD do not accept scripts as interpreters, using #!/bin/sh and sourcing.
+if [ true != "$INIT_D_SCRIPT_SOURCED" ] ; then
+    set "$0" "$@"; INIT_D_SCRIPT_SOURCED=true . /lib/init/init-d-script
+fi
+### BEGIN INIT INFO
+# Provides:          graphite-api
+# Required-Start:    $remote_fs $syslog $network
+# Required-Stop:     $remote_fs $syslog $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Graphite-API service
+### END INIT INFO
+
+DESC="Graphite-API service"
+DAEMON=/usr/bin/gunicorn3
+NAME=graphite-api
+PIDFILE="/run/$NAME.pid"
+USER=_graphite
+GROUP=_graphite
+DAEMON_ARGS="--name=$NAME"
+DAEMON_ARGS="$DAEMON_ARGS --log-file=/var/log/graphite-api/gunicorn.log"
+DAEMON_ARGS="$DAEMON_ARGS --user=$USER --group=$GROUP"
+DAEMON_ARGS="$DAEMON_ARGS --daemon --pid=$PIDFILE"
+DAEMON_ARGS="$DAEMON_ARGS graphite_api.app:app"
+
+do_stop_cmd_override() {
+    start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 \
+            --pidfile ${PIDFILE} --exec /usr/bin/python3
+    RETVAL="$?"
+    [ "$RETVAL" = 2 ] && return 2
+    start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 \
+            --pidfile ${PIDFILE} --exec /usr/bin/python3
+    [ "$?" = 2 ] && return 2
+    rm -f $PIDFILE
+    return $RETVAL
+}

diff --git a/logrotate.d/graphite-api b/logrotate.d/graphite-api
new file mode 100644 (file)
index 0000000..125da00
--- /dev/null
+++ b/logrotate.d/graphite-api
@@ -0,0 +1,8 @@
+/var/log/graphite-api/*.log {
+       weekly
+       missingok
+       rotate 4
+       compress
+       notifempty
+       create 640 _graphite _graphite
+}

diff --git a/rc0.d/K01graphite-api b/rc0.d/K01graphite-api
new file mode 120000 (symlink)
index 0000000..0ec1ed6
--- /dev/null
+++ b/rc0.d/K01graphite-api
@@ -0,0 +1 @@
+../init.d/graphite-api
\ No newline at end of file

diff --git a/rc1.d/K01graphite-api b/rc1.d/K01graphite-api
new file mode 120000 (symlink)
index 0000000..0ec1ed6
--- /dev/null
+++ b/rc1.d/K01graphite-api
@@ -0,0 +1 @@
+../init.d/graphite-api
\ No newline at end of file

diff --git a/rc2.d/S01graphite-api b/rc2.d/S01graphite-api
new file mode 120000 (symlink)
index 0000000..0ec1ed6
--- /dev/null
+++ b/rc2.d/S01graphite-api
@@ -0,0 +1 @@
+../init.d/graphite-api
\ No newline at end of file

diff --git a/rc3.d/S01graphite-api b/rc3.d/S01graphite-api
new file mode 120000 (symlink)
index 0000000..0ec1ed6
--- /dev/null
+++ b/rc3.d/S01graphite-api
@@ -0,0 +1 @@
+../init.d/graphite-api
\ No newline at end of file

diff --git a/rc4.d/S01graphite-api b/rc4.d/S01graphite-api
new file mode 120000 (symlink)
index 0000000..0ec1ed6
--- /dev/null
+++ b/rc4.d/S01graphite-api
@@ -0,0 +1 @@
+../init.d/graphite-api
\ No newline at end of file

diff --git a/rc5.d/S01graphite-api b/rc5.d/S01graphite-api
new file mode 120000 (symlink)
index 0000000..0ec1ed6
--- /dev/null
+++ b/rc5.d/S01graphite-api
@@ -0,0 +1 @@
+../init.d/graphite-api
\ No newline at end of file

diff --git a/rc6.d/K01graphite-api b/rc6.d/K01graphite-api
new file mode 120000 (symlink)
index 0000000..0ec1ed6
--- /dev/null
+++ b/rc6.d/K01graphite-api
@@ -0,0 +1 @@
+../init.d/graphite-api
\ No newline at end of file