Rename mysql-agent to mysql-snmp

Author: Robin Bowes

Makefile

@@ -14,11 +14,11 @@
 build:
 
 install:
-	install -m 755 mysql-agent $(DESTDIR)/usr/sbin/mysql-agent
+	install -m 755 mysql-snmp $(DESTDIR)/usr/sbin/mysql-snmp
 	install -m 644 MYSQL-SERVER-MIB.txt $(DESTDIR)/usr/share/snmp/mibs
-	install -m 644 mysql-agent.1 $(DESTDIR)/usr/share/man/man1
-	gzip $(DESTDIR)/usr/share/man/man1/mysql-agent.1
+	install -m 644 mysql-snmp.1 $(DESTDIR)/usr/share/man/man1
+	gzip $(DESTDIR)/usr/share/man/man1/mysql-snmp.1
 
 clean:
-	-rm $(DESTDIR)/usr/sbin/mysql-agent
+	-rm $(DESTDIR)/usr/sbin/mysql-snmp
 

README

@@ -4,7 +4,7 @@ Copyright (c) 2008,2009 Brice Figureau <[email protected]>
 PREAMBLE
 ========
 
-mysql-agent is a MySQL Net-SNMP agent written in Perl, and using the Net-Snmp 
+mysql-snmp is a MySQL Net-SNMP agent written in Perl, and using the Net-Snmp 
 Perl bindings.
 
 It connects to a mysql server and returns information to Net-SNMP when needed.
@@ -43,7 +43,7 @@ Please build the package:
 $ dpkg-buildpackage -rfakeroot -uc- b
 
 and install it
-Then, modify /etc/default/mysql-agent
+Then, modify /etc/default/mysql-snmp
 
 Other
 -----

debian/init.d

@@ -25,11 +25,11 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/mysql-agent
+DAEMON=/usr/sbin/mysql-smnp
 DAEMON2="/usr/bin/perl"
-NAME=mysql-agent
+NAME=mysql-snmp
 DESC="Mysql SNMP Agent"
-PID_FILE=/var/run/mysql-agent.pid
+PID_FILE=/var/run/mysql-snmp.pid
 
 test -x $DAEMON || exit 0
 

mysql-agent mysql-snmp

@@ -23,7 +23,7 @@
 
 use strict;
 
-my $VERSION = "v1.0_02";
+my $VERSION = "v1.1_01";
 $VERSION = eval $VERSION;
 
 ## Packages ##
@@ -405,7 +405,7 @@ use DBD::mysql;
 use Pod::Usage;
 
 my %opt = (
-    daemon_pid => '/var/run/mysql-agent.pid',
+    daemon_pid => '/var/run/mysql-snmp.pid',
     oid        => '1.3.6.1.4.1.20267.200.1',
     port       => 3306,
     refresh    => 300,
@@ -622,9 +622,9 @@ run() unless caller();
 
 # daemonize the program
 sub daemonize {
-    open STDIN, '/dev/null' or die "mysql-agent: can't read /dev/null: $!";
-    open STDOUT, '>/dev/null' or die "mysql-agent: can't write to /dev/null: $!";
-    defined(my $pid = fork) or die "mysql-agent: can't fork: $!";
+    open STDIN, '/dev/null' or die "mysql-snmp: can't read /dev/null: $!";
+    open STDOUT, '>/dev/null' or die "mysql-snmp: can't write to /dev/null: $!";
+    defined(my $pid = fork) or die "mysql-snmp: can't fork: $!";
     if ($pid) {
         # parent
         open my $pidfile, '>', $opt{daemon_pid}
@@ -635,8 +635,8 @@ sub daemonize {
     }
 
     # child
-    setsid() or die "mysql-agent: can't start a new session: $!";
-    open STDERR, '>&STDOUT' or die "mysql-agent: can't dup stdout: $!";
+    setsid() or die "mysql-snmp: can't start a new session: $!";
+    open STDERR, '>&STDOUT' or die "mysql-snmp: can't dup stdout: $!";
 }
 
 sub max {
@@ -988,7 +988,7 @@ sub dolog {
 }
 
 sub VersionMessage {
-    print "mysql-agent $VERSION by brice.figureau\@daysofwonder.com\n";
+    print "mysql-snmp $VERSION by brice.figureau\@daysofwonder.com\n";
 }
 
 sub run 
@@ -1031,7 +1031,7 @@ sub run
         $dsn .= join(';', "host=$opt{host}", "port=$opt{port}");
     }
 
-    openlog("mysql-agent", LOG_PID | LOG_PERROR, LOG_DAEMON);
+    openlog("mysql-snmp", LOG_PID | LOG_PERROR, LOG_DAEMON);
 
     daemonize() if !$opt{'no-daemon'};
 
@@ -1080,11 +1080,11 @@ __END__
 
 =head1 NAME
 
-    mysql-agent - report mysql statistics via SNMP 
+    mysql-snmp - report mysql statistics via SNMP 
  
 =head1 SYNOPSIS
  
-    mysql-agent [options]
+    mysql-snmp [options]
 
     -h HOST, --host=HOST      connect to MySQL DB on HOST
     -P PORT, --port=PORT      port to connect (default 3306)
@@ -1199,7 +1199,7 @@ output version information and exit
 
 =head1 DESCRIPTION
 
-B<mysql-agent> is a small daemon that connects to a local snmpd daemon
+B<mysql-snmp> is a small daemon that connects to a local snmpd daemon
 to report statistics on a local or remote MySQL server.
 
 =cut

mysql-agent.1 mysql-snmp.1

@@ -16,12 +16,12 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-mysql-agent \- MySQL-Server SNMP agent for Net-SNMP
+mysql-snmp \- MySQL-Server SNMP agent for Net-SNMP
 .SH SYNOPSIS
-.B mysql-agent
+.B mysql-snmp
 .RI "[ options ]"
 .SH DESCRIPTION
-.B mysql-agent
+.B mysql-snmp
 is a Net-SNMP (snmpd) agent that can be used to monitor a MySQL server with SNMP. 
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
@@ -44,7 +44,7 @@ output version information and exit
 
 .TP
 .B \-\-daemon-pid=FILE
-write PID to FILE instead of /var/run/mysql-agent.pid
+write PID to FILE instead of /var/run/mysql-snmp.pid
 
 .TP
 .B \-u DBUSER
@@ -105,7 +105,7 @@ password=secret
 .BR snmpcmd (1).
 .br
 .SH AUTHOR
-mysql-agent was written by Brice Figureau
+mysql-snmp was written by Brice Figureau
 .PP
 This manual page was written by Brice Figureau <[email protected]>,
 for the Debian project (but may be used by others).

opennms/tools/cacti2opennms.pl

@@ -393,7 +393,7 @@ =head1 OPTIONS
   * graph: outputs the content of the snmp-graph.properties
   * graphlist: outputs the content of the snmp-graph.properties reports key
   * datacollection: outputs the content of the datacollections-config.xml file
-  * agent: outputs the needed array for mysql-agent
+  * agent: outputs the needed array for mysql-snmp
 
 =item B<--man>
 
@@ -415,7 +415,7 @@ =head1 OPTIONS
 
 =head1 DESCRIPTION
 
-B<mysql-agent> is a small daemon that connects to a local snmpd daemon
+B<mysql-snmp> is a small daemon that connects to a local snmpd daemon
 to report statistics on a local or remote MySQL server.
 
 =cut

redhat/mysql-agent.init redhat/mysql-snmp.init

@@ -1,14 +1,14 @@
 #! /bin/sh
 #
-# mysql-agent   Init script for running the mysql snmp agent daemon
+# mysql-snmp    Init script for running the mysql snmp agent daemon
 #
 # Author:       Robin Bowes <[email protected]>
 #
 # chkconfig: - 98 02
 #
 # description: Enables monitoring of MySQL through SNMP
-# processname: mysql-agent
-# config: /etc/sysconfig/mysql-agent
+# processname: mysql-snmp
+# config: /etc/sysconfig/mysql-snmp
 #
 # This script is based on a debian init script written by Brice Figureau
 #
@@ -19,10 +19,10 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-prog=mysql-agent
+prog=mysql-snmp
 daemon="/usr/sbin/$prog"
 
-# Include mysql-agent defaults if available
+# Include mysql-snmp defaults if available
 if [ -e /etc/sysconfig/$prog ] ; then
         . /etc/sysconfig/$prog
 fi

redhat/mysql-agent.spec redhat/mysql-snmp.spec

@@ -1,5 +1,5 @@
-Name:           mysql-agent
-Version:        1.0
+Name:           mysql-snmp
+Version:        1.1
 Release:        1%{?dist}
 Summary:        SNMP monitoring agent for MySQL
 
@@ -14,6 +14,7 @@ Requires:       perl(DBI), perl(DBD::mysql) >= 1.0, perl(Unix::Syslog)
 Requires:       perl(SNMP), perl(NetSNMP::OID), perl(NetSNMP::agent), perl(NetSNMP::ASN)
 Requires:       perl(NetSNMP::agent::default_store), perl(NetSNMP::default_store)
 Requires:       net-snmp >= 5.4.2
+Obsoletes:      mysql-agent
 
 %description
 mysql-snmp is a small daemon that connects to a local snmpd daemon
@@ -30,12 +31,12 @@ install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp
 install -d ${RPM_BUILD_ROOT}%{_mandir}/man1
 install -d ${RPM_BUILD_ROOT}%{_datadir}/snmp/mibs
-install -c -m 755 mysql-agent ${RPM_BUILD_ROOT}%{_sbindir} 
-install -c -m 755 redhat/mysql-agent.init ${RPM_BUILD_ROOT}%{_initrddir}/%{name}
-install -c -m 644 redhat/mysql-agent.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
+install -c -m 755 mysql-snmp ${RPM_BUILD_ROOT}%{_sbindir} 
+install -c -m 755 redhat/mysql-snmp.init ${RPM_BUILD_ROOT}%{_initrddir}/%{name}
+install -c -m 644 redhat/mysql-snmp.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 install -c -m 600 my.cnf ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp
-install -c -m 644 mysql-agent.1 ${RPM_BUILD_ROOT}%{_mandir}/man1
-gzip ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-agent.1 
+install -c -m 644 mysql-snmp.1 ${RPM_BUILD_ROOT}%{_mandir}/man1
+gzip ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-snmp.1 
 install -m 644 MYSQL-SERVER-MIB.txt ${RPM_BUILD_ROOT}%{_datadir}/snmp/mibs
 
 %clean

redhat/mysql-agent.sysconfig redhat/mysql-snmp.sysconfig

@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    require 'mysql-agent';
+    require 'mysql-snmp';
 }
 
 use Test::More tests => 11;