gitorious/nagios-http-json
1
0
Fork 0
mirror of https://github.com/drewkerrigan/nagios-http-json.git synced 2024-11-21 18:03:48 +01:00
Code Issues Releases Wiki Activity
149 Commits 4 Branches 10 Tags 746 KiB
d9ee817dfc
Commit Graph

149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Opolka
d9ee817dfc Update dev-requirements 2024-04-09 14:07:29 +02:00
Markus Opolka
ce9c5fdada
Merge pull request #85 from drewkerrigan/extend-tests 
Extend tests for array syntax
 2024-03-22 15:52:10 +01:00
Markus Opolka
27c710b2ea Extend tests for array syntax 2024-03-22 15:45:25 +01:00
Markus Opolka
dddf8432d6
Merge pull request #80 from mho21/master 
disabled check_hostname to prevent error message when setting CERT_NONE
 2022-10-04 16:26:06 +02:00
Markus Hof
739c093702 disabled check_hostname to prevent error message when setting CERT_NONE 2022-10-04 16:04:12 +02:00
Markus Opolka
46271c961b Bump version to 2.1.2 2022-09-15 15:25:38 +02:00
Markus Opolka
49b338bdb6
Merge pull request #79 from drewkerrigan/feature/http-method 
Add CLI Flag to change HTTP method
 2022-09-15 15:22:48 +02:00
Markus Opolka
9f41fc491e Add CLI flag to change HTTP method 2022-09-09 17:28:35 +02:00
Markus Opolka
3a22b712ab Fix deprecation of PROTOCOL_TLS 2022-09-09 17:26:23 +02:00
Markus Opolka
9626fc4464
Merge pull request #78 from drewkerrigan/docs/update-repo 
Update Makefile and Workflows
 2022-09-08 10:09:43 +02:00
Markus Opolka
c54a0040a0 Update pylint config 2022-09-08 10:08:39 +02:00
Markus Opolka
ffd96dd59f Update GitHub Workflow 2022-09-08 10:04:20 +02:00
Markus Opolka
0572c2f494 Update Makefile 
- Use python from venv
 2022-09-08 10:01:23 +02:00
Markus Opolka
2e6eaeea59
Merge pull request #77 from K0nne/patch-1 
fix missing type conversion for --data
 2022-09-08 09:59:28 +02:00
K0nne
428a5a6d3a
fix missing type conversion for --data 
The parameter --data is handled as type string, but the method urlopen() only accepts the datatype byte.
Before this fix you will get: "TypeError: POST data should be  bytes, an iterable of bytes, or a filer object. It cannot be of type str."
This PR solves this.
 2022-07-27 13:30:25 +02:00
Markus Opolka
e3ac06864d
Merge pull request #68 from ccin2p3/feature/load_default_ca_certs 
[TLS] Always load system default C.A files
 2021-01-22 10:39:33 +01:00
Rémi Ferrand
63542f3226 If TLS is enabled, context now loads the system default C.A files 
* This allows system wide deployed C.A to be used without any further
  configuration.
 2021-01-21 12:02:41 +01:00
Markus Opolka
cdb2474ee0 Update README 2020-11-24 20:27:40 +01:00
Markus Opolka
2821a1ae66
Merge pull request #66 from drewkerrigan/array-bug 
Fix conditional check on empty data.
 2020-09-14 10:36:14 +02:00
Markus Opolka
831bfdf97b
Merge pull request #65 from alesc/patch-1 
Update icinga2_check_command_definition.conf
 2020-09-12 08:21:01 +02:00
alesc
f612277772
Update icinga2_check_command_definition.conf 
small error in icinga2 conf definition, --key_metricS does not exist --key_metric does.
 2020-09-11 10:18:02 +02:00
Markus Opolka
1f440e0ff5 Fix conditional check on empty data. 
Fixes issue #64
 2020-07-15 08:07:16 +02:00
Markus Opolka
c23ebac77a
Merge pull request #63 from drewkerrigan/v2-1 
Release 2.1
 2020-07-03 09:58:55 +02:00
Markus Opolka
a014944981
Merge pull request #62 from drewkerrigan/key-equals-empty 
Add handling of empty JSON return values
 2020-07-03 09:04:53 +02:00
Markus Opolka
47a37556ba
Merge branch 'v2-1' into key-equals-empty 2020-07-03 09:03:21 +02:00
Markus Opolka
41279cad2c
Merge pull request #60 from drewkerrigan/http-json 
Parse JSON on HTTPError, if JSON in response
 2020-07-03 09:02:14 +02:00
Markus Opolka
f7c0472cdc Add JSON parsing on HTTPError 
- Only if response contains JSON
 2020-07-02 11:35:23 +02:00
Markus Opolka
25fb340bbb Add handling of empty JSON return values 
- Will now throw a CRITICAL
 2020-06-26 10:39:37 +02:00
Markus Opolka
47bdea7fc5 Add spaces to debug output 2020-06-26 10:31:20 +02:00
Markus Opolka
866a12ea07 Add JSON parsing on HTTPError 
- Only if response contains JSON
 2020-06-19 14:26:59 +02:00
Markus Opolka
d1e585b2dd Adjust pylint for new function 2020-06-19 13:16:07 +02:00
Markus Opolka
941afeed89 Move main entrypoint to own function for simpler testing 2020-06-19 13:12:51 +02:00
Markus Opolka
b9a583f281 Add Makefile and requirements.txt for easier testing 2020-06-19 13:12:48 +02:00
Markus Opolka
4c89a8a93d Update README 2020-04-03 11:53:00 +02:00
Markus Opolka
73557b3657
Merge pull request #58 from bb-Ricardo/next-release 
added icinga2 command definitions
 2020-04-03 11:50:29 +02:00
Ricardo Bartels
aad2376ac0 added missing cli args for V2.0 2020-04-02 08:39:42 +02:00
Markus Opolka
219e99386c
Merge pull request #57 from drewkerrigan/v2.0 
Release V2.0
 2020-03-31 18:15:06 +02:00
Markus Opolka
0cbbf41b9c Update README 2020-03-23 09:11:22 +01:00
Markus Opolka
dd952fd571 Replace deprecated encodestring 
- Fixes #56
 2020-03-18 08:47:27 +01:00
Markus Opolka
83ee5062f5 [wip] Add pylint and fix pylint issues 2020-03-18 08:18:07 +01:00
Markus Opolka
c90b0323f5 Show returned JSON in OK Status when performance data is requested 2020-03-18 07:41:23 +01:00
Markus Opolka
1ac160e8c2 Add boilerplate for CLI tests 2020-03-18 07:41:23 +01:00
Markus Opolka
6fc41612c4 Add unittest for debugprint 2020-03-18 07:41:23 +01:00
Markus Opolka
f567c1ca0c Add unittest for metric key alias 2020-03-18 07:41:23 +01:00
Markus Opolka
2c98e840e8 Extend unittest coverage 2020-03-18 07:41:18 +01:00
Markus Opolka
1a9e1e9048 Add unittest for NagiosHelper 2020-03-15 09:45:18 +01:00
Markus Opolka
4f1d29dc7e
Merge pull request #55 from marxin/fix-python38-warnings 
Fix new Python3.8 warnings:
 2020-03-12 14:17:34 +01:00
Martin Liska
404890d918
Fix new Python3.8 warnings: 
./check_http_json.py:186: SyntaxWarning: "is" with a literal. Did you mean "=="?
  if elemData is (None, 'not_found'):
./check_http_json.py:189: SyntaxWarning: "is not" with a literal. Did you mean "!="?
  if subElemKey is not '':
 2020-03-12 09:37:53 +01:00
Markus Opolka
e7cf7ca8fb
Merge pull request #54 from drewkerrigan/fix-issue-43 
Add value_separator option to specify how JSON values are being split
 2020-03-09 20:39:00 +01:00
Markus Opolka
71cbd98e79 Add value_separator option to specify how JSON values are being split 
- Fixes issue 43
 2020-03-08 11:28:27 +01:00