public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dashboards as cfg: include cfg files in dist packages

Browse Source
This commit is contained in:
bergquist
2017-12-07 15:27:01 +01:00
parent 1dfa529941
commit 361acd3fa1
13 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/deb/control/postinst
+4
View File
@@ -29,6 +29,10 @@ case "$1" in
if [ ! -f $CONF_FILE ]; then
cp /usr/share/grafana/conf/sample.ini $CONF_FILE
cp /usr/share/grafana/conf/ldap.toml /etc/grafana/ldap.toml
mkdir -p /etc/grafana/dashboards /etc/grafana/datasources
cp /usr/share/grafana/conf/dashboards/sample.yaml /etc/grafana/dashboards/sample.yaml
cp /usr/share/grafana/conf/datasources/sample.yaml /etc/grafana/datasources/sample.yaml
fi
# configuration files should not be modifiable by grafana user, as this can be a security issue
packaging/deb/default/grafana-server
+4
View File
@@ -18,5 +18,9 @@ RESTART_ON_UPGRADE=true
PLUGINS_DIR=/var/lib/grafana/plugins
DATASOURCES_CFG_DIR=/etc/grafana/datasources
DASHBOARDS_CFG_DIR=/etc/grafana/dashboards
# Only used on systemd systems
PID_FILE_DIR=/var/run/grafana
packaging/deb/init.d/grafana-server
+3 -1
View File
@@ -33,6 +33,8 @@ DATA_DIR=/var/lib/grafana
PLUGINS_DIR=/var/lib/grafana/plugins
LOG_DIR=/var/log/grafana
CONF_FILE=$CONF_DIR/grafana.ini
DATASOURCES_CFG_DIR=$CONF_DIR/datasources
DASHBOARDS_CFG_DIR=$CONF_DIR/dashboards
MAX_OPEN_FILES=10000
PID_FILE=/var/run/$NAME.pid
DAEMON=/usr/sbin/$NAME
@@ -55,7 +57,7 @@ if [ -f "$DEFAULT" ]; then
. "$DEFAULT"
fi
DAEMON_OPTS="--pidfile=${PID_FILE} --config=${CONF_FILE} cfg:default.paths.data=${DATA_DIR} cfg:default.paths.logs=${LOG_DIR} cfg:default.paths.plugins=${PLUGINS_DIR}"
DAEMON_OPTS="--pidfile=${PID_FILE} --config=${CONF_FILE} cfg:default.paths.datasources=$DATASOURCES_CFG_DIR cfg:default.paths.dashboards=$DASHBOARDS_CFG_DIR cfg:default.paths.data=${DATA_DIR} cfg:default.paths.logs=${LOG_DIR} cfg:default.paths.plugins=${PLUGINS_DIR}"
function checkUser() {
if [ `id -u` -ne 0 ]; then
packaging/deb/systemd/grafana-server.service
+10 -6
View File
@@ -14,12 +14,16 @@ Restart=on-failure
WorkingDirectory=/usr/share/grafana
RuntimeDirectory=grafana
RuntimeDirectoryMode=0750
ExecStart=/usr/sbin/grafana-server \
--config=${CONF_FILE} \
--pidfile=${PID_FILE_DIR}/grafana-server.pid \
cfg:default.paths.logs=${LOG_DIR} \
cfg:default.paths.data=${DATA_DIR} \
cfg:default.paths.plugins=${PLUGINS_DIR}
ExecStart=/usr/sbin/grafana-server \
--config=${CONF_FILE} \
--pidfile=${PID_FILE_DIR}/grafana-server.pid \
cfg:default.paths.logs=${LOG_DIR} \
cfg:default.paths.data=${DATA_DIR} \
cfg:default.paths.plugins=${PLUGINS_DIR} \
cfg:default.paths.datasources=${DATASOURCES_CFG_DIR} \
cfg:default.paths.dashboards=${DASHBOARDS_CFG_DIR}
LimitNOFILE=10000
TimeoutStopSec=20
UMask=0027