|
[-]
[+]
|
Changed |
_service:tar_git:collectd.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/rinigus/collectd</param>
<param name="branch">sailfish</param>
- <param name="revision">5.12.0.sfos.4</param>
+ <param name="revision">5.12.0.sfos.5</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
|
|
[-]
[+]
|
Changed |
_service:tar_git:collectd-5.12.0.sfos.5.tar.bz2/contrib/sailfish/collectd.conf
^
|
| @@ -2164,3 +2164,8 @@
# </Type>
# </Host>
#</Plugin>
+
+# Include system-wide drop-ins
+<Include "/etc/collectd.d">
+ Filter "*.conf"
+</Include>
|
|
[-]
[+]
|
Changed |
_service:tar_git:collectd-5.12.0.sfos.5.tar.bz2/contrib/sailfish/collectd.spec
^
|
| @@ -15,6 +15,7 @@
Source1: collectd.service
Source2: collectd.conf
Source3: collectd2tmpfs.sh
+Source4: processes.conf.example
Source10: connman.py
Source11: ofono.py
@@ -300,6 +301,7 @@
%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_userunitdir}/collectd.service
%{__install} -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/collectd.conf
%{__install} -Dp -m0755 %{SOURCE3} %{buildroot}%{_bindir}/collectd2tmpfs
+%{__install} -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/collectd.d/processes.conf.example
#%{__install} -Dp -m0644 %{_sourcedir}/collectd2tmpfs.service %{buildroot}%{_userunitdir}/collectd2tmpfs.service
#%{__install} -Dp -m0644 %{_sourcedir}/collectd2tmpfs.timer %{buildroot}%{_userunitdir}/collectd2tmpfs.timer
@@ -370,6 +372,8 @@
%files
#%doc AUTHORS COPYING ChangeLog README
%config(noreplace) %{_sysconfdir}/collectd.conf
+%dir %{_sysconfdir}/collectd.d
+%config %{_sysconfdir}/collectd.d/processes.conf.example
%{_userunitdir}/collectd.service
#%{_userunitdir}/collectd2tmpfs.service
#%{_userunitdir}/collectd2tmpfs.timer
|
|
[-]
[+]
|
Added |
_service:tar_git:collectd-5.12.0.sfos.5.tar.bz2/contrib/sailfish/processes.conf.example
^
|
| @@ -0,0 +1,25 @@
+#
+# example config for process monitoring
+#
+<Plugin processes>
+ # monitor exact process name
+ #
+ #Process "lipstick"
+ #Process "systemd-journald"
+ #Process "systemd-logind"
+ #Process "systemd-udevd"
+
+ # monitor matching processes
+ # use for anything launched through Sailjail, as those apps will have multiple processes
+ # also, allows you to give a pretty name for the collection
+ #
+ #ProcessMatch "Systemdatascope" "systemdatascope"
+ #ProcessMatch "Fernschreiber" "harbour-fernschreiber"
+ #
+ #ProcessMatch "systemd_all" "systemd-.*"
+ #ProcessMatch "fpd" "(sailfish|encsfa)-fpd"
+ #
+ # Android support: monitor most android system processes
+ #ProcessMatch "com.android" "com.android.*"
+</Plugin>
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:collectd.conf
^
|
| @@ -2164,3 +2164,8 @@
# </Type>
# </Host>
#</Plugin>
+
+# Include system-wide drop-ins
+<Include "/etc/collectd.d">
+ Filter "*.conf"
+</Include>
|
|
[-]
[+]
|
Added |
_service:tar_git:processes.conf.example
^
|
| @@ -0,0 +1,25 @@
+#
+# example config for process monitoring
+#
+<Plugin processes>
+ # monitor exact process name
+ #
+ #Process "lipstick"
+ #Process "systemd-journald"
+ #Process "systemd-logind"
+ #Process "systemd-udevd"
+
+ # monitor matching processes
+ # use for anything launched through Sailjail, as those apps will have multiple processes
+ # also, allows you to give a pretty name for the collection
+ #
+ #ProcessMatch "Systemdatascope" "systemdatascope"
+ #ProcessMatch "Fernschreiber" "harbour-fernschreiber"
+ #
+ #ProcessMatch "systemd_all" "systemd-.*"
+ #ProcessMatch "fpd" "(sailfish|encsfa)-fpd"
+ #
+ # Android support: monitor most android system processes
+ #ProcessMatch "com.android" "com.android.*"
+</Plugin>
+
|
