ref: refs/heads/master commit 2e3420c8b4dea0367df680465cc1f4e86f085e83 Author: bbrunner <bbrunner@suse.de> Date: Wed Nov 18 14:56:14 2009 +0100 collectd saves datas to /var/lib/collectd/WebYaST --- plugins/status/lib/status.rb | 3 +++ .../status/package/yast2-webservice-status.changes | 5 +++++ .../status/package/yast2-webservice-status.spec | 6 +++++- 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index e34815d..fbca074 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -74,6 +74,9 @@ class Status # returns the data path def datapath if @datapath.blank? + if File.directory? "/var/lib/collectd/WebYaST" + @datapath = "/var/lib/collectd/WebYaST" + else # if no datapath is set, use the first directory with the valid hostname in /var/lib/collectd datapath_list = Dir.glob("/var/lib/collectd/*") hostname = `hostname` diff --git a/plugins/status/package/yast2-webservice-status.changes b/plugins/status/package/yast2-webservice-status.changes index f40d8a2..5b7d4cd 100644 --- a/plugins/status/package/yast2-webservice-status.changes +++ b/plugins/status/package/yast2-webservice-status.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 18 14:54:36 CET 2009 - bbrunner@suse.de + +- collectd saves datas to /var/lib/collectd/WebYaST static; (bnc#555204) + +------------------------------------------------------------------- Tue Nov 10 14:40:47 CET 2009 - schubi@suse.de - searching for the correct host in /var/lib/collectd/; (bnc#549022) diff --git a/plugins/status/package/yast2-webservice-status.spec b/plugins/status/package/yast2-webservice-status.spec index f4ba47f..683866d 100644 --- a/plugins/status/package/yast2-webservice-status.spec +++ b/plugins/status/package/yast2-webservice-status.spec @@ -90,10 +90,14 @@ sed -i "s/^FQDNLookup.*/FQDNLookup false/" "/etc/collectd.conf" sed -i "s/^#LoadPlugin df.*/LoadPlugin df/" "/etc/collectd.conf" # +# set "Hostname" to WebYaST +# +sed -i "s/^#Hostname[[:space:]].*/#If you change hostname please delete \/var\/lib\/collectd\/WebYaST\nHostname \"WebYaST\"/" "/etc/collectd.conf" +# # enable and start collectd # %{fillup_and_insserv -Y collectd} -rccollectd start +rccollectd restart %files %defattr(-,root,root) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org