From ea9f8750f8c4422a26c3ebb971d85f72f98e441e Mon Sep 17 00:00:00 2001 From: linggao Date: Fri, 21 Mar 2008 20:59:14 +0000 Subject: [PATCH] handle startmon, stopmon and updatemon name changes git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@870 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT-2.0/xCAT/Schema.pm | 10 +++++----- xCAT-client-2.0/debian/rules | 14 +++++++++----- xCAT-client-2.0/pods/man1/monstart.1.pod | 4 ++-- xCAT-client-2.0/pods/man1/reventlog.1.pod | 2 +- xCAT-server-2.0/lib/xcat/monitoring/snmpmon.pm | 2 +- xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm | 2 +- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/perl-xCAT-2.0/xCAT/Schema.pm b/perl-xCAT-2.0/xCAT/Schema.pm index f486120bc..d4f528775 100644 --- a/perl-xCAT-2.0/xCAT/Schema.pm +++ b/perl-xCAT-2.0/xCAT/Schema.pm @@ -96,9 +96,9 @@ monitoring => { cols => [qw(name nodestatmon comments disable)], keys => [qw(name)], required => [qw(name)], - table_desc => 'Controls what external monitoring tools xCAT sets up and uses. Entries should be added and removed from this table using the provided xCAT commands startmon and stopmon.', + table_desc => 'Controls what external monitoring tools xCAT sets up and uses. Entries should be added and removed from this table using the provided xCAT commands monstart and monstop.', descriptions => { - name => "The name of the mornitoring plug-in module. The plug-in must be put in $ENV{XCATROOT}/lib/perl/xCAT_monitoring/. See the man page for startmon for details.", + name => "The name of the mornitoring plug-in module. The plug-in must be put in $ENV{XCATROOT}/lib/perl/xCAT_monitoring/. See the man page for monstart for details.", nodestatmon => 'Specifies if the monitoring plug-in is used to feed the node status to the xCAT cluster. Any one of the following values indicates "yes": y, Y, yes, Yes, YES, 1. Any other value or blank (default), indicates "no".', comments => 'Any user-written notes.', disable => "Set to 'yes' or '1' to comment out this row.", @@ -108,10 +108,10 @@ monsetting => { cols => [qw(name key value comments disable)], keys => [qw(name key)], required => [qw(name key)], - table_desc => 'Specifies the monitoring plug-in specific settings. These settings will be used by the monitoring plug-in to customize the behavior such as event filter, sample interval, responses etc. Entries should be added, removed or modified by chtab command. Entries can also be added or modified by the startmon command when a monitoring plug-in is brought up.', + table_desc => 'Specifies the monitoring plug-in specific settings. These settings will be used by the monitoring plug-in to customize the behavior such as event filter, sample interval, responses etc. Entries should be added, removed or modified by chtab command. Entries can also be added or modified by the monstart command when a monitoring plug-in is brought up.', descriptions => { - name => "The name of the mornitoring plug-in module. The plug-in must be put in $ENV{XCATROOT}/lib/perl/xCAT_monitoring/. See the man page for startmon for details.", - key => 'Specifies the name of the attribute. The valid values are specified by each monitoring plug-in. Use "lsmon name -d" to get a list of valid keys.', + name => "The name of the mornitoring plug-in module. The plug-in must be put in $ENV{XCATROOT}/lib/perl/xCAT_monitoring/. See the man page for monstart for details.", + key => 'Specifies the name of the attribute. The valid values are specified by each monitoring plug-in. Use "monls name -d" to get a list of valid keys.', value => 'Specifies the value of the attribute.', comments => 'Any user-written notes.', disable => "Set to 'yes' or '1' to comment out this row.", diff --git a/xCAT-client-2.0/debian/rules b/xCAT-client-2.0/debian/rules index e738d71ae..14bf344c0 100755 --- a/xCAT-client-2.0/debian/rules +++ b/xCAT-client-2.0/debian/rules @@ -56,8 +56,9 @@ install: build $(INSTALL) -D share/man/man1/rpower.1 $(TMPDIR)/usr/share/man/man1/rpower.1 $(INSTALL) -D share/man/man1/rscan.1 $(TMPDIR)/usr/share/man/man1/rscan.1 $(INSTALL) -D share/man/man1/rvitals.1 $(TMPDIR)/usr/share/man/man1/rvitals.1 - $(INSTALL) -D share/man/man1/startmon.1 $(TMPDIR)/usr/share/man/man1/startmon.1 - $(INSTALL) -D share/man/man1/stopmon.1 $(TMPDIR)/usr/share/man/man1/stopmon.1 + $(INSTALL) -D share/man/man1/monstart.1 $(TMPDIR)/usr/share/man/man1/monstart.1 + $(INSTALL) -D share/man/man1/monstop.1 $(TMPDIR)/usr/share/man/man1/monstop.1 + $(INSTALL) -D share/man/man1/monls.1 $(TMPDIR)/usr/share/man/man1/monls.1 $(INSTALL) -D share/man/man1/unregnotif.1 $(TMPDIR)/usr/share/man/man1/unregnotif.1 $(INSTALL) -D share/man/man1/xcat2nim.1 $(TMPDIR)/usr/share/man/man1/xcat2nim.1 $(INSTALL) -D share/man/man1/xdsh.1 $(TMPDIR)/usr/share/man/man1/xdsh.1 @@ -99,9 +100,12 @@ install: build dh_link usr/bin/xcatclientnnr usr/sbin/copycds dh_link usr/bin/xcatclientnnr usr/bin/regnotif dh_link usr/bin/xcatclientnnr usr/bin/unregnotif - dh_link usr/bin/xcatclientnnr usr/bin/startmon - dh_link usr/bin/xcatclientnnr usr/bin/stopmon - dh_link usr/bin/xcatclientnnr usr/bin/updatemon + dh_link usr/bin/xcatclientnnr usr/bin/monstart + dh_link usr/bin/xcatclientnnr usr/bin/monstop + dh_link usr/bin/xcatclientnnr usr/bin/monls + dh_link usr/bin/xcatclientnnr usr/sbin/monupdate + dh_link usr/bin/xcatclientnnr usr/sbin/monaddnode + dh_link usr/bin/xcatclientnnr usr/sbin/monrmnode dh_link usr/bin/xcatDBcmds usr/bin/mkdef dh_link usr/bin/xcatDBcmds usr/bin/chdef dh_link usr/bin/xcatDBcmds usr/bin/lsdef diff --git a/xCAT-client-2.0/pods/man1/monstart.1.pod b/xCAT-client-2.0/pods/man1/monstart.1.pod index 07bf5b21f..13b022a02 100644 --- a/xCAT-client-2.0/pods/man1/monstart.1.pod +++ b/xCAT-client-2.0/pods/man1/monstart.1.pod @@ -21,9 +21,9 @@ This command is used to register a monitoring plug-in module and invoke it to mo =head1 Parameters -I is the name of the monitoring plug-in module. For example, if the the I is called I, then the actual file name that the xcatd looks for is I. Use I command to list all the monitoring plug-in modules that can be used. +I is the name of the monitoring plug-in module. For example, if the the I is called I, then the actual file name that the xcatd looks for is I. Use I command to list all the monitoring plug-in modules that can be used. -I is the monitoring plug-in specific settings. It is used to customize the behavior of the plug-in or configure the 3rd party software. Format: I<[key-value],[key=value]...> Please note that the square brackets are needed here. Use I command to look for the possbile setting keys for a plug-in module. +I is the monitoring plug-in specific settings. It is used to customize the behavior of the plug-in or configure the 3rd party software. Format: I<[key-value],[key=value]...> Please note that the square brackets are needed here. Use I command to look for the possbile setting keys for a plug-in module. =head1 OPTIONS diff --git a/xCAT-client-2.0/pods/man1/reventlog.1.pod b/xCAT-client-2.0/pods/man1/reventlog.1.pod index a2dcf7a2e..6578a5508 100644 --- a/xCAT-client-2.0/pods/man1/reventlog.1.pod +++ b/xCAT-client-2.0/pods/man1/reventlog.1.pod @@ -63,4 +63,4 @@ B I I =head1 B -rpower(1), startmon(1) +rpower(1), monstart(1) diff --git a/xCAT-server-2.0/lib/xcat/monitoring/snmpmon.pm b/xCAT-server-2.0/lib/xcat/monitoring/snmpmon.pm index 049e56699..c96b47235 100644 --- a/xCAT-server-2.0/lib/xcat/monitoring/snmpmon.pm +++ b/xCAT-server-2.0/lib/xcat/monitoring/snmpmon.pm @@ -431,7 +431,7 @@ sub getDescription { the xCAT trap handler will log all events into the syslog and only email the critical and the warning events to the mail alias called 'alerts'. You can use the settings to override the default behavior. - Use command 'startmon snmpmon' to star monitoring and 'stopmon snmpmon' + Use command 'monstart snmpmon' to star monitoring and 'monstop snmpmon' to stop it. Settings: ignore: specifies the events that will be ignored. It's a comma separated diff --git a/xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm b/xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm index 7cb98b65d..c3f83500c 100644 --- a/xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm +++ b/xCAT-server-2.0/lib/xcat/monitoring/xcatmon.pm @@ -309,7 +309,7 @@ sub getDescription { return " Description: xcatmon uses fping to report the node liveness status and update the - nodelist.status column. Use command 'startmon xcatmon -n' to start + nodelist.status column. Use command 'monstart xcatmon -n' to start monitoring. Settings: ping-interval: the number of minutes between each fping operation.