diff --git a/etc/ciscoapi/ciscoapi.conf.clean b/etc/ciscoapi/ciscoapi.conf.clean deleted file mode 100644 index 9a1da2a71892c045336dbf7ddb420cdb5a430529..0000000000000000000000000000000000000000 --- a/etc/ciscoapi/ciscoapi.conf.clean +++ /dev/null @@ -1,49 +0,0 @@ -[global] -#http_proxy = http://<username>:<password>@<hostname|ip-address>:<port> -#https_proxy = http://<username>:<password>@<hostname|ip-address>:<port> -#use_system_proxies = True -#wait_after_start = True -#max_wait_time = 15 -#loglevel = warning -#base_dir = ~/var/ciscoapi - -[eox] -# refresh records very X day's -#eox_refresh_known = 31 -#eox_refresh_unknown = 7 - -[sn2info] -#sn2info_refresh_covered = 31 -#sn2info_refresh_notcovered = 7 - -[psirt] -#psirt_refresh_found = 1 -#psirt_refresh_notfound = 1 - -[suggestion] -#suggestion_refresh_found = 31 -#suggestion_refresh_notfound = 7 - -[bug] -refresh_found = 2 -refresh_notfound = 1 - -[cisco_api] -# client id for Cisco API or auth proxy requests -#client_id = your.cisco.api.id -# -# client secret for Cisco API or auth proxy requests -#client_secret = your.cisco.api.cerdentials -# -# use auth proxy or go directly to Cisco API -#useauthproxy = False -# -# URL for auth proxy -#authproxyurl = https://cmk.bech-noc.de/api/cauthproxy.py -# -# client fqdn for auth proxy client identity -#client_fqdn = fqdn.domain.tld -# -# root cert for auth proxy -#root_cert = True -# diff --git a/etc/ciscoapi/ciscoapi.json.clean b/etc/ciscoapi/ciscoapi.json.clean new file mode 100644 index 0000000000000000000000000000000000000000..db41b7c2f948785a46c652eddfc9b5052bbf9725 --- /dev/null +++ b/etc/ciscoapi/ciscoapi.json.clean @@ -0,0 +1,42 @@ +{ + "global": { + "http_proxy": "http://username:password@hostname.domain.tld:port", + "https_proxy": "http://username:password@hostname.domain.tld:port", + "use_system_proxies": true, + "wait_after_start": true, + "max_wait_time": 15, + "loglevel": "warning", + "base_dir": "~/var/ciscoapi" + }, + "eox": { + "eox_refresh_known": 31, + "eox_refresh_unknown": 7 + }, + "sn2info": { + "sn2info_refresh_covered": 31, + "sn2info_refresh_notcovered": 7 + }, + "psirt": { + "psirt_refresh_found": 1, + "psirt_refresh_notfound": 1 + }, + "suggestion": { + "suggestion_refresh_found": 31, + "suggestion_refresh_notfound": 7 + }, + "bug": { + "refresh_found": 7, + "refresh_notfound": 1 + }, + "cisco_api": { + "client_id": "your.cisco.api.id", + "client_secret": "your.cisco.api.cerdentials", + "useauthproxy": false, + "authproxyurl": "https://cmk.bech-noc.de/api/cauthproxy.py", + "client_fqdn": "fqdn.domain.tld", + "root_cert": true + }, + "productinfo": { + "productseriesfile": "~/var/ciscoapi/productinfo", + }, +} \ No newline at end of file diff --git a/etc/cron.d/cisco_api_support b/etc/cron.d/cisco_api_support index dfc9466fd771a905be741b3f420faaefbdcc0d27..891d7a5e70bf44bd4c16b405d21e5bc0afd559b1 100755 --- a/etc/cron.d/cisco_api_support +++ b/etc/cron.d/cisco_api_support @@ -1,6 +1,4 @@ -# every hour -15 * * * * $OMD_ROOT/local/bin/ciscoapi/cisco-eox.py +0 * * * * $OMD_ROOT/local/bin/ciscoapi/cisco-eox.py 15 * * * * $OMD_ROOT/local/bin/ciscoapi/cisco-sn2info.py -15 * * * * $OMD_ROOT/local/bin/ciscoapi/cisco-psirt.py -15 * * * * $OMD_ROOT/local/bin/ciscoapi/cisco-suggestion.py -15 * * * * $OMD_ROOT/local/bin/ciscoapi/cisco-bug.py +30 * * * * $OMD_ROOT/local/bin/ciscoapi/cisco-psirt.py +45 * * * * $OMD_ROOT/local/bin/ciscoapi/cisco-bug.py diff --git a/inv_cisco_support.mkp b/inv_cisco_support.mkp index 771afc99d00cccde52fe064a2210fc5c5792793d..a35d91cf9c8c5856fa3fb242f70e1ef3309153fa 100644 Binary files a/inv_cisco_support.mkp and b/inv_cisco_support.mkp differ diff --git a/packages/inv_cisco_support b/packages/inv_cisco_support index 644bfe78d545afef481dcb35c7d33568ca7f141c..5721f1fec46dfe11711bd25bf0a83d10a1ad1d84 100644 --- a/packages/inv_cisco_support +++ b/packages/inv_cisco_support @@ -24,18 +24,14 @@ 'ciscoapi/cisco-eox.py', 'ciscoapi/cisco-sn2info.py', 'ciscoapi/cisco-psirt.py', - 'ciscoapi/cisco-suggestion.py', 'ciscoapi/cisco-bug.py'], - 'lib': ['nagios/plugins/cisco_api_status'], 'web': ['plugins/views/inv_cisco_support.py', 'plugins/wato/inv_cisco_bug.py', 'plugins/wato/inv_cisco_eox.py', 'plugins/wato/inv_cisco_contract.py', - 'plugins/wato/inv_cisco_psirt.py', - 'plugins/wato/inv_cisco_suggestion.py', - 'plugins/wato/cisco_api_status.py']}, + 'plugins/wato/inv_cisco_psirt.py']}, 'name': 'inv_cisco_support', - 'num_files': 20, + 'num_files': 16, 'title': 'Inventory for Cisco Bug, EoX, contract status, PSIRT advisories and ' 'suggested software', 'version': '2021-07-23.v0.1',