Author: glen Date: Sun Oct 5 12:58:26 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - stop bashism - register cacti template
---- Files affected: SPECS: cacti-addons-snmpdiskio.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/cacti-addons-snmpdiskio.spec diff -u SPECS/cacti-addons-snmpdiskio.spec:1.5 SPECS/cacti-addons-snmpdiskio.spec:1.6 --- SPECS/cacti-addons-snmpdiskio.spec:1.5 Sun Oct 5 13:18:26 2008 +++ SPECS/cacti-addons-snmpdiskio.spec Sun Oct 5 14:58:21 2008 @@ -1,19 +1,17 @@ # $Revision$, $Date$ -# TODO -# - %%post - add template to cacti -%define realname snmpdiskio -%include /usr/lib/rpm/macros.perl +%define plugin snmpdiskio Summary: Disk I/O statistics (Read/Write bytes) in Cacti Summary(pl.UTF-8): Statystyki operacji dyskowych we/wy (odczyt/zapis w bajtach) w Cacti Name: cacti-addons-snmpdiskio Version: 0.9.4 -Release: 0.1 +Release: 0.3 License: GPL v2 Group: Applications/WWW -# snmpdiskio 0.9.4 (Disk I/O statistics on Linux) - http://forums.cacti.net/about12742.html -Source0: http://forums.cacti.net/files/%{realname}-%{version}.tar.gz +Source0: http://forums.cacti.net/files/%{plugin}-%{version}.tar.gz +Patch0: %{name}-bashism.patch # Source0-md5: 9f3512729ae6cad0904cac0fada719eb -URL: http://www.debianhelp.co.uk/cactitemplates.htm +URL: http://forums.cacti.net/about12742.html +Requires: cacti-add_template BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -30,6 +28,7 @@ Summary: Disk I/O statistics (Read/Write bytes) over SNMP Summary(pl.UTF-8): Statystyki operacji dyskowych we/wy (odczyt/zapis w bajtach) po SNMP Group: Applications +Requires: awk %description -n snmpdiskio This set of simple scripts gives you disk I/O statistics over SNMP; @@ -43,19 +42,31 @@ Disk I/O (w bajtach/sekundę). %prep -%setup -q -n %{realname}-%{version} +%setup -q -n %{plugin}-%{version} +%patch0 -p1 + +cat > snmp.%{plugin}.conf <<'EOF' +exec .1.3.6.1.4.1.2021.54 hdNum %{_sbindir}/snmpdiskio hdNum +exec .1.3.6.1.4.1.2021.55 hdIndex %{_sbindir}/snmpdiskio hdIndex +exec .1.3.6.1.4.1.2021.56 hdDescr %{_sbindir}/snmpdiskio hdDescr +exec .1.3.6.1.4.1.2021.57 hdInBlocks %{_sbindir}/snmpdiskio hdInBlocks +exec .1.3.6.1.4.1.2021.58 hdOutBlocks %{_sbindir}/snmpdiskio hdOutBlocks +EOF %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{cactidir}/cacti,%{cactidir}/scripts,%{cactidir}/resource/script_queries,%{cactidir}/resource/snmp_queries,%{cactidir}/resource/script_server,%{_bindir}} +install -d $RPM_BUILD_ROOT{%{cactidir}/resource/script_queries,%{cactidir}/resource/snmp_queries,%{_sbindir}} install cacti_data_query_snmp_disk_statistics.xml $RPM_BUILD_ROOT%{cactidir}/resource/script_queries install cacti_graph_template_disk_io_bytessec.xml $RPM_BUILD_ROOT%{cactidir}/resource/script_queries install partition.xml $RPM_BUILD_ROOT%{cactidir}/resource/snmp_queries -install snmpdiskio $RPM_BUILD_ROOT%{_bindir} +install snmpdiskio $RPM_BUILD_ROOT%{_sbindir} %clean rm -rf $RPM_BUILD_ROOT +%post +%{_sbindir}/cacti-add_template %{resourcedir}/cacti_host_template_webserver_lighttpd.xml + %files %defattr(644,root,root,755) %doc ChangeLog README TODO @@ -65,8 +76,8 @@ %files -n snmpdiskio %defattr(644,root,root,755) -%doc ChangeLog README TODO -%attr(755,root,root) %{_bindir}/snmpdiskio +%doc README snmp.%{plugin}.conf +%attr(755,root,root) %{_sbindir}/snmpdiskio %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -74,6 +85,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2008/10/05 12:58:21 glen +- stop bashism +- register cacti template + Revision 1.5 2008/10/05 11:18:26 glen - simplify macros and cleanups ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cacti-addons-snmpdiskio.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
