Changeset 3290 for monitoring

Timestamp:

08/06/13 15:42:23 (11 years ago)

Author:

sanmai

Message:

• Fix test script.
• Add column to MPI monitoring checks table for -b parameter used by check_clarin_ldap.py

Location:

monitoring/plugins/mpi

Files:

• integration_test.R (modified) (6 diffs)
• plugins_hosts_services.tab (modified) (1 diff)

monitoring/plugins/mpi/integration_test.R

@@ -13 +13 @@
 ## test_results has a value equal to the exit status of the scripts with arguments command_line_arguments run.
 
-test_results <- 
+check_exit_status <- 
     base:::integer(length = base:::nrow(checks_info));
-test_stdout <- 
+check_stdout <- 
     base:::character(length = base:::nrow(checks_info));
 #test_stderr 
@@ -26 +26 @@
 for (test_index in 1L:base:::nrow(checks_info))
 {
-    base:::message(base:::paste("Running test", test_index));
+    base:::message(base:::paste("Checking", checks_info[test_index,]$description, "..."));
 
     command_line <- 
@@ -37 +37 @@
                      '-u', checks_info[test_index,]$`-u`);
     }
+    if (checks_info[test_index,]$`-b` != "") {
+        command_line <- 
+            base:::c(command_line, 
+                     '-b', checks_info[test_index,]$`-b`);
+    }
 
     test_output <-
@@ -46 +51 @@
     ## Fetch exit status codes.  
     if(!base:::is.null(base:::attr(test_output, "status"))) {
-        test_results[test_index] <- 
+        check_exit_status[test_index] <- 
             base:::as.integer(base:::attr(test_output, "status"));
     } else { 
-        test_results[test_index] <- 
+        check_exit_status[test_index] <- 
             0L;
     };
 
-    test_stdout[test_index] <-
+    check_stdout[test_index] <-
         base:::paste(test_output, 
                       sep = "\n", 
@@ -69 +74 @@
     base:::data.frame(description             = checks_info$description,
                       command_line            = base:::unlist(command_lines), 
-                      test_results            = test_results, 
-                      test_stdout             = test_stdout,
+                      check_exit_status       = check_exit_status, 
+                      check_stdout            = check_stdout,
                       stringsAsFactors        = FALSE);
 
@@ -76 +81 @@
 
 test_results_file_path <- 
-    "/tmp/test_results.tab";
+    "/tmp/Nagios_checks_test.tab";
 
 utils:::write.table(test_results_df,

monitoring/plugins/mpi/plugins_hosts_services.tab

@@ -1 @@
-file name       description     -h      protocol        -u
-check_lat_cql_endpoint.py       CQL endpoint    cqlservlet.mpi.nl       http    '/'
-check_clarin_vlo.py     Virtual Language Observatory    catalog.clarin.eu       http    '/vlo/'
-check_clarin_comp_reg.py        Component Registry      catalog.clarin.eu       http    '/ds/ComponentRegistry/'
-check_lat_lexus.py      Lexus   corpus1.mpi.nl  http    '/mpi/lexusDojo/'
-check_lat_lamus.py      Lamus   corpus1.mpi.nl  http    '/jkc/lamus/lamusstart.jsp'
-check_lat_imdi.py       IMDI browser    lux17.mpi.nl    http    '/ds/imdi_browser/viewcontroller?request=view&nodeid=MPI299144%23'
-check_lat_imdi.py       IMDI browser    corpus1.mpi.nl  http    '/ds/imdi_browser/viewcontroller?request=view&nodeid=MPI299144%23'
-check_lat_handle.py     Handle  hdl.handle.net  http    '/?hdl=1839%2F00-0000-0000-0000-0000-4&auth=x'
-check_lat_annex.py      Annex   corpus1.mpi.nl  http    '/ds/annex/runLoader?nodeid=MPI600401%23'
-check_lat_oai_endpoint.py       OAI-PMH corpus1.mpi.nl  http    '/ds/oaiprovider/oai2?verb=Identify'
-check_clarin_saml.py    SAML    www.clarin.eu   https   
-check_clarin_discojuice_json.py Discojuice JSON catalog.clarin.eu       http    '/mw1/sds/discojuice'
-check_clarin_discojuice_json.py Discojuice JSON catalog.clarin.eu       http    '/mw2/sds/discojuice'
-check_clarin_discojuice_html.py Discojuice HTML catalog.clarin.eu       http    '/discojuice/metadata_clarin1.json'
-check_clarin_discojuice_html.py Discojuice HTML catalog.clarin.eu       http    '/discojuice/metadata_clarin2.json'
-check_lat_avatech_clam.py       AVATecH CLAM    lux17.mpi.nl    http    '/avatech/avatech_iais_fine_segmentation'
-check_clarin_ldap.py    LDAP directory  user.clarin.eu  ldap    
+file name       description     -h      protocol        -u      -b
+check_lat_cql_endpoint.py       CQL endpoint    cqlservlet.mpi.nl       http    '/'     
+check_clarin_vlo.py     Virtual Language Observatory    catalog.clarin.eu       http    '/vlo/' 
+check_clarin_comp_reg.py        Component Registry      catalog.clarin.eu       http    '/ds/ComponentRegistry/'        
+check_lat_lexus.py      Lexus   corpus1.mpi.nl  http    '/mpi/lexusDojo/'       
+check_lat_lamus.py      Lamus   corpus1.mpi.nl  http    '/jkc/lamus/lamusstart.jsp'     
+check_lat_imdi.py       IMDI browser    lux17.mpi.nl    http    '/ds/imdi_browser/viewcontroller?request=view&nodeid=MPI299144%23'      
+check_lat_imdi.py       IMDI browser    corpus1.mpi.nl  http    '/ds/imdi_browser/viewcontroller?request=view&nodeid=MPI299144%23'      
+check_lat_handle.py     Handle  hdl.handle.net  http    '/?hdl=1839%2F00-0000-0000-0000-0000-4&auth=x'  
+check_lat_annex.py      Annex   corpus1.mpi.nl  http    '/ds/annex/runLoader?nodeid=MPI600401%23'       
+check_lat_oai_endpoint.py       OAI-PMH corpus1.mpi.nl  http    '/ds/oaiprovider/oai2?verb=Identify'    
+check_clarin_saml.py    SAML    www.clarin.eu   https           
+check_clarin_discojuice_html.py Discojuice HTML catalog.clarin.eu       http    '/mw1/sds/discojuice'   
+check_clarin_discojuice_html.py Discojuice HTML catalog.clarin.eu       http    '/mw2/sds/discojuice'   
+check_clarin_discojuice_json.py Discojuice JSON catalog.clarin.eu       http    '/discojuice/metadata_clarin1.json'     
+check_clarin_discojuice_json.py Discojuice JSON catalog.clarin.eu       http    '/discojuice/metadata_clarin2.json'     
+check_lat_avatech_clam.py       AVATecH CLAM    lux17.mpi.nl    http    '/avatech/avatech_iais_fine_segmentation'       
+check_clarin_ldap.py    LDAP directory  user.clarin.eu  ldap    cn=Directory Manager