Changeset 9661f81 in nscp for modules/CheckExternalScripts/CheckExternalScripts.cpp

Timestamp:

05/10/10 22:17:31 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

f40d813

Parents:

d1029bd

Message:

2010-05-10 MickeM - 0.3.8 RC2

• Fixed issue with listpdh and debugpdh (not works again) + Fixed issue and added support for IN ( ... ) and NOT IN ( ... ) operators (CheckEventLog)

2010-05-08 MickeM

+ Added new "script templating" thing to simplify adding scripts:

Two new sections: [Script Wrappings] for adding templates and [Wrapped Scripts] for adding the scripts.

%SCRIPT% is replaced with the script name
%ARGS% is replaced with arguments.

vbs=cscript.exe T:30 NoLogo scripts\wrapper.vbs %SCRIPT% %ARGS%

and

w_vbs=check_test.vbs /arg1:1 /arg2:1 /variable:1

is the same as:

w_vbs=cscript.exe T:30 NoLogo scripts\wrapper.vbs check_test.vbs /arg1:1 /arg2:1 /variable:1

• Added correct syntax for VB scripts
• Added correct syntax for powershell scripts
• Cleaned up scripts folder + Added new "NagiosPlugin? library" from op5 + Added check_no_rdp.vbs (Checks that no RDP connection is online) + Added check_battery.vbs which checks batterys via WMI + Added check_printer.vbs to check printers via WMI

File:

• modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (2 diffs)

modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -64 +64 @@
   }
   FindClose(hFind);
+}
+
+
+std::wstring CheckExternalScripts::getWrapping(std::wstring val) {
+  strEx::token tok = strEx::getToken(val, ' ', true);
+  std::wstring::size_type pos = tok.first.find_last_of(_T("."));
+  if (pos == std::wstring::npos)
+    return _T("");
+  return tok.first.substr(pos+1);
+}
+
+void CheckExternalScripts::addWrappedCommand(std::wstring key, std::wstring tpl, std::wstring command ) {
+  strEx::token tok = strEx::getToken(command, ' ', true);
+  strEx::replace(tpl, _T("%SCRIPT%"), tok.first);
+  strEx::replace(tpl, _T("%ARGS%"), tok.second);
+  tok = strEx::getToken(tpl, ' ', true);
+  addCommand(key.c_str(),tok.first, tok.second);
 }
 
@@ -96 +113 @@
   }
 
+  std::map<std::wstring,std::wstring> wrappers;
+  std::list<std::wstring> wrappings = NSCModuleHelper::getSettingsSection(EXTSCRIPT_WRAPPINGS_SECTION_TITLE);
+  for (it = wrappings.begin(); it != wrappings.end(); ++it) {
+    std::wstring val = NSCModuleHelper::getSettingsString(EXTSCRIPT_WRAPPINGS_SECTION_TITLE, *it, _T(""));
+    if (!(*it).empty() && !val.empty()) {
+      wrappers[(*it)] = val;
+    }
+  }
+  std::list<std::wstring> wscript = NSCModuleHelper::getSettingsSection(EXTSCRIPT_WRAPPED_SCRIPT_SECTION_TITLE);
+  for (it = wrappings.begin(); it != wscript.end(); ++it) {
+    std::wstring val = NSCModuleHelper::getSettingsString(EXTSCRIPT_WRAPPED_SCRIPT_SECTION_TITLE, *it, _T(""));
+    if (!(*it).empty() && !val.empty()) {
+      std::wstring type = getWrapping(val);
+      std::map<std::wstring,std::wstring>::const_iterator cit = wrappers.find(type);
+      if (cit == wrappers.end()) {
+        NSC_LOG_ERROR_STD(_T("Failed to find wrappings for: ") + type + _T(" (" + (*it) + _T(")")));
+      } else {
+        addWrappedCommand((*it), (*cit).second, val);
+      }
+    }
+  }
+
   if (!scriptDirectory_.empty()) {
     addAllScriptsFrom(scriptDirectory_);