rpm/collectd
SHA256
1
0
Fork 0
forked from pool/collectd
Code Pull Requests Activity

Accepting request 361036 from home:k0da:branches:server:monitoring

Browse Source 
- Build turbostat plugin only for Intel architectures

OBS-URL: https://build.opensuse.org/request/show/361036
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=133
This commit is contained in:
Martin Hauke 2016-02-23 07:48:56 +00:00 committed by Git OBS Bridge
parent 321fa44ea3
commit 46d2c9f437
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
collectd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 23 01:00:56 UTC 2016 - dvaleev@suse.com
- Build turbostat plugin only for Intel architectures
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 15 20:48:24 UTC 2016 - mardnh@gmx.de Fri Jan 15 20:48:24 UTC 2016 - mardnh@gmx.de

8
collectd.spec
View File

@ -24,7 +24,7 @@
%define snmp 1 %define snmp 1
%define with_esmtp 1 %define with_esmtp 1
%define ipvs_plugin ipvs %define ipvs_plugin ipvs
%define plugins apache apcups battery %{expand:%{bind_plugin}} cgroups curl %{expand:%{curl_json_plugin}} %{expand:%{curl_xml_plugin}} conntrack contextswitch cpu cpufreq csv df disk %{expand:%{dns_plugin}} email entropy exec filecount fscache hddtemp interface %{expand:%{ipvs_plugin}} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%{memcached_plugin}} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool %{expand:%{sensors_plugin}} serial statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%{ascent_plugin}} %{expand:%{iptables_plugin}} %{expand:%{madwifi_plugin}} %{expand:%{rrdcached_plugin}} aggregation ethstat md numa tail_csv write_graphite write_riemann ceph drbd fhcount ipc log_logstash turbostat write_log write_log write_sensu write_tsdb zfs_arc zookeeper %define plugins apache apcups battery %{expand:%{bind_plugin}} cgroups curl %{expand:%{curl_json_plugin}} %{expand:%{curl_xml_plugin}} conntrack contextswitch cpu cpufreq csv df disk %{expand:%{dns_plugin}} email entropy exec filecount fscache hddtemp interface %{expand:%{ipvs_plugin}} irq load logfile match_empty_counter match_hashed match_regex match_timediff match_value mbmon %{expand:%{memcached_plugin}} memory multimeter netlink network nfs nginx ntpd olsrd openvpn perl ping protocols powerdns processes rrdtool %{expand:%{sensors_plugin}} serial statsd swap syslog table tail target_notification target_replace target_scale target_set target_v5upgrade tcpconns teamspeak2 ted thermal threshold unixsock uptime users uuid vmem vserver wireless write_http %{expand:%{ascent_plugin}} %{expand:%{iptables_plugin}} %{expand:%{madwifi_plugin}} %{expand:%{rrdcached_plugin}} aggregation ethstat md numa tail_csv write_graphite write_riemann ceph drbd fhcount ipc log_logstash %{expand:%{turbostat_plugin}} write_log write_log write_sensu write_tsdb zfs_arc zookeeper
%ifnarch s390 s390x %ifnarch s390 s390x
%define sensors 1 %define sensors 1
%define sensors_plugin sensors %define sensors_plugin sensors
@ -32,6 +32,12 @@
%define sensors 0 %define sensors 0
%define sensors_plugin %{nil} %define sensors_plugin %{nil}
%endif %endif
%ifarch %ix86 x86_64
%define turbostat_plugin turbostat
%else
%define turbostat_plugin %{nil}
%endif
%if 0%{?_with_xmms:1}0 %if 0%{?_with_xmms:1}0
%define xmms 1 %define xmms 1
%else %else