Allow custom versions with the release file...

[nagiosplug.git] / plugins / check_mrtg.c

diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index cf77f8bfe0cba87e57ac77a722b11750c0b7315a..65260ed1bae406c8da0ff55d98ab65fc180e7467 100644 (file)
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -5,8 +5,6 @@
 * License: GPL
 * Copyright (c) 1999-2007 Nagios Plugins Development Team
 * 
-* Last Modified: $Date$
-* 
 * Description:
 * 
 * This file contains the check_mrtg plugin
@@ -28,12 +26,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
-* $Id$
 * 
 *****************************************************************************/
 
 const char *progname = "check_mrtg";
-const char *revision =  "$Revision$";
 const char *copyright = "1999-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
@@ -57,7 +53,7 @@ char *units;
 int
 main (int argc, char **argv)
 {
-       int result = STATE_UNKNOWN;
+       int result = STATE_OK;
        FILE *fp;
        int line;
        char input_buffer[MAX_INPUT_BUFFER];
@@ -72,6 +68,9 @@ main (int argc, char **argv)
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments\n"));
 
@@ -178,7 +177,7 @@ process_arguments (int argc, char **argv)
                {"warning", required_argument, 0, 'w'},
                {"label", required_argument, 0, 'l'},
                {"units", required_argument, 0, 'u'},
-               {"verbose", no_argument, 0, 'v'},
+               {"variable", required_argument, 0, 'v'},
                {"version", no_argument, 0, 'V'},
                {"help", no_argument, 0, 'h'},
                {0, 0, 0, 0}
@@ -234,7 +233,7 @@ process_arguments (int argc, char **argv)
                        units = optarg;
                        break;
                case 'V':                                                                       /* version */
-                       print_revision (progname, revision);
+                       print_revision (progname, NP_VERSION);
                        exit (STATE_OK);
                case 'h':                                                                       /* help */
                        print_help ();
@@ -314,7 +313,7 @@ validate_arguments (void)
 void
 print_help (void)
 {
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
 
        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
        printf (COPYRIGHT, copyright, email);
@@ -327,10 +326,11 @@ print_help (void)
        print_usage ();
 
        printf (_(UT_HELP_VRSN));
+       printf (_(UT_EXTRA_OPTS));
 
        printf (" %s\n", "-F, --logfile=FILE");
   printf ("   %s\n", _("The MRTG log file containing the data you want to monitor"));
-  printf ("-e, --expires=MINUTES");
+  printf (" %s\n", "-e, --expires=MINUTES");
   printf ("   %s\n", _("Minutes before MRTG data is considered to be too old"));
   printf (" %s\n", "-a, --aggregation=AVG|MAX");
   printf ("   %s\n", _("Should we check average or maximum values?"));
@@ -367,13 +367,16 @@ print_help (void)
   printf ("   %s\n", _("you can always hack the code to make this plugin work for you..."));
   printf (" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded from"));
   printf ("   %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
+#ifdef NP_EXTRA_OPTS
+       printf (" -%s", _(UT_EXTRA_OPTS_NOTES));
+#endif
 
        printf (_(UT_SUPPORT));
 }
 
 
 
-/* original command line: 
+/* original command line:
         <log_file> <expire_minutes> <AVG|MAX> <variable> <vwl> <vcl> <label> [units] */
 
 void