installer now installs systemd service if the host is running systemd
Costa Tsaousis committed
May 29, 2016 at 23:21 UTC
eddd9af2d712ef8d5e3b22c3ee050b9623bb5229
1 file changed
+82
-41
netdata-installer.sh
+82
-41
@@ -524,60 +524,95 @@ isnetdata() {
524
return 1
525
}
526
527
+stop_netdata_on_pid() {
528
+ local pid="$1" ret=0 count=0
529
528
-echo >&2
529
-echo >&2 "-------------------------------------------------------------------------------"
530
-echo >&2
531
-printf >&2 "Stopping a (possibly) running netdata..."
532
-ret=0
533
-count=0
534
-while [ $ret -eq 0 ]
535
-do
536
- if [ $count -gt 30 ]
537
- then
538
- echo >&2 "Cannot stop the running netdata."
539
- exit 1
540
- fi
530
+ isnetdata $pid || return 0
531
542
- count=$((count + 1))
532
+ printf >&2 "Stopping netdata on pid $pid ..."
533
+ while [ ! -z "$pid" -a $ret -eq 0 ]
534
+ do
535
+ if [ $count -gt 45 ]
536
+ then
537
+ echo >&2 "Cannot stop the running netdata on pid $pid."
538
+ return 1
539
+ fi
540
+
541
+ count=$(( count + 1 ))
542
544
- pid=$(cat "${NETDATA_RUN_DIR}/netdata.pid" 2>/dev/null)
545
- # backwards compatibility
546
- [ -z "${pid}" ] && pid=$(cat /var/run/netdata.pid 2>/dev/null)
547
- [ -z "${pid}" ] && pid=$(cat /var/run/netdata/netdata.pid 2>/dev/null)
548
-
549
- isnetdata $pid || pid=
550
- if [ ! -z "${pid}" ]
551
- then
543
run kill $pid 2>/dev/null
544
ret=$?
554
- else
555
- run killall netdata 2>/dev/null
556
- ret=$?
545
+
546
+ test $ret -eq 0 && printf >&2 "." && sleep 2
547
+ done
548
+
549
+ echo >&2
550
+ if [ $ret -eq 0 ]
551
+ then
552
+ echo >&2 "SORRY! CANNOT STOP netdata ON PID $pid !"
553
+ return 1
554
fi
555
559
- test $ret -eq 0 && printf >&2 "." && sleep 2
560
-done
561
-echo >&2
562
-echo >&2
556
+ echo >&2 "netdata on pid $pid stopped."
557
+ return 0
558
+}
559
+
560
+stop_all_netdata() {
561
+ local p
562
563
+ echo >&2 "Stopping a (possibly) running netdata..."
564
+
565
+ for p in $(cat "${NETDATA_RUN_DIR}/netdata.pid" 2>/dev/null) \
566
+ $(cat /var/run/netdata.pid 2>/dev/null) \
567
+ $(cat /var/run/netdata/netdata.pid 2>/dev/null) \
568
+ $(pidof netdata 2>/dev/null)
569
+ do
570
+ stop_netdata_on_pid $p
571
+ done
572
+}
573
574
# -----------------------------------------------------------------------------
566
-# run netdata
575
+# check netdata for systemd
576
568
-echo >&2 "Starting netdata..."
569
-run ${NETDATA_PREFIX}/usr/sbin/netdata -P ${NETDATA_RUN_DIR}/netdata.pid "${@}"
577
+running=0
578
+pidof systemd >/dev/null 2>&1
579
+if [ $? -eq 0 -a "${UID}" -eq 0 ]
580
+then
581
+ # systemd is running on this system
582
571
-if [ $? -ne 0 ]
583
+ if [ ! -f /etc/systemd/system/netdata.service ]
584
then
573
- echo >&2
574
- echo >&2 "SORRY! FAILED TO START NETDATA!"
575
- exit 1
576
-else
577
- echo >&2 "OK. NetData Started!"
585
+ echo >&2 "Installing systemd service..."
586
+ run cp system/netdata.service /etc/systemd/system/netdata.service && \
587
+ run systemctl daemon-reload && \
588
+ run systemctl enable netdata
589
+ else
590
+ run service netdata stop
591
+ fi
592
+
593
+ stop_all_netdata
594
+ run service netdata start && running=1
595
fi
579
-echo >&2
596
597
+if [ ${running} -eq 0 ]
598
+then
599
+ # no systemd (or not running as root, or systemd failed)
600
+
601
+ stop_all_netdata
602
+
603
+ echo >&2 "Starting netdata..."
604
+ run ${NETDATA_PREFIX}/usr/sbin/netdata -P ${NETDATA_RUN_DIR}/netdata.pid "${@}"
605
+ if [ $? -ne 0 ]
606
+ then
607
+ echo >&2
608
+ echo >&2 "SORRY! FAILED TO START NETDATA!"
609
+ exit 1
610
+ else
611
+ echo >&2 "OK. NetData Started!"
612
+ fi
613
+
614
+ echo >&2
615
+fi
616
617
# -----------------------------------------------------------------------------
618
# save a config file, if it is not already there
@@ -633,7 +668,7 @@ ksm_is_available_but_disabled() {
668
-------------------------------------------------------------------------------
669
Memory de-duplication instructions
670
636
- I see you have kernel memory de-duper (called Kernel Same-page Merging,
671
+ You have kernel memory de-duper (called Kernel Same-page Merging,
672
or KSM) available, but it is not currently enabled.
673
674
To enable it run:
@@ -741,7 +776,7 @@ cat >netdata-uninstaller.sh <<-UNINSTALL
776
fi
777
778
echo >&2 "Stopping a possibly running netdata..."
744
- killall netdata
779
+ for p in \$(pidof netdata); do kill \$x; done
780
sleep 2
781
782
deletedir() {
@@ -782,6 +817,12 @@ cat >netdata-uninstaller.sh <<-UNINSTALL
817
rm -i /etc/logrotate.d/netdata
818
fi
819
820
+ if [ -f /etc/systemd/system/netdata.service ]
821
+ then
822
+ echo "Deleting /etc/systemd/system/netdata.service ..."
823
+ rm -i /etc/systemd/system/netdata.service
824
+ fi
825
+
826
getent passwd netdata > /dev/null
827
if [ $? -eq 0 ]
828
then