Commit graph

314 commits

Author SHA1 Message Date
René Moser
eab5892944 Merge pull request #1867 from Censio/rhunter-monit-startup
monit startup fix
2016-05-03 22:51:26 +02:00
René Moser
6049d03d3a Merge pull request #2089 from mscherer/fix_datadog
2 small fixes for datadog
2016-04-29 10:03:12 +02:00
Michael Scherer
e07a52b499 Mark api_key as no_log to avoid potential leaks (#2048) 2016-04-29 09:56:28 +02:00
Markus Ostertag
d5ab3dc0f3 Change success status code to 202
As I already mentioned here: a1b1182662 (diff-d04a476e5d71372918cb6e7e5b39a683R120) @jimi-c added some "hidden" additional check in his urllib commit and broke the whole module for everybody as Datadog answers with an 202 in case of success (http://docs.datadoghq.com/api/#troubleshooting).
2016-04-26 14:39:00 +02:00
Michael Scherer
1b18c74918 Remove unused import of 'socket' module 2016-04-22 17:33:05 +02:00
Michael Scherer
ed4dd65057 Mark api_key as no_log, since that's supposed to be kept secret 2016-04-22 17:33:05 +02:00
Michael Scherer
ba74516640 Fix aibrake 2016-04-21 21:53:37 +02:00
Michael Scherer
14c323cc8e Fix default url in airbrake_deployment doc (#2078) 2016-04-21 13:24:19 +02:00
Michael Scherer
f9f00ef404 Mark the token as sensitive, since it shouldn't be printed (#2043) 2016-04-18 11:19:14 -04:00
Jordan Cohen
359b2abebc idempotency fix (#2024) 2016-04-16 14:10:49 +02:00
René Moser
ab656bb7dd Merge pull request #1866 from Jimdo/monitor_thresholds
Allow Datadog metric alerts to define multiple thresholds
2016-03-30 12:09:12 +02:00
Julien Recurt
cd1114a2bd Add option to use ZabbixApi via auth basic protection 2016-03-25 19:00:17 +01:00
René Moser
141e3f045c Merge pull request #1684 from foozmeat/patch-1
Added a source parameter for setting the JIT client name
2016-03-19 13:55:51 +01:00
René Moser
69b7175932 Merge pull request #1084 from ritzk/zabbix_inventory-mode
zabbix_host : add the ability to set inventory_mode #1005
2016-03-19 13:26:31 +01:00
René Moser
6e15dec236 Merge pull request #1853 from tomgoto/zabbix_host_delete_version
change zabbix host.delete() parameter for newer API
2016-03-19 01:24:19 +01:00
Paul Seiffert
2f0edbeccb Allow Datadog metric alerts to define multiple thresholds 2016-03-17 20:32:06 +01:00
René Moser
77552d780f Merge pull request #1692 from m4mnux/devel
Replace deprecated zabbix api method 'exists' to support zabbix 3.0
2016-03-16 22:25:50 +01:00
René Moser
eb9e57407e Merge pull request #1763 from eikef/zabbix30apiexistsremoval
Replace deprecated exists API for Zabbix 3.0 compatibility
2016-03-15 23:02:19 +01:00
René Moser
c6afbc9e17 Merge pull request #1761 from kepstin/zabbix-3-0
zabbix_maintenance: Stop using api removed in zabbix 3.0
2016-03-15 22:59:24 +01:00
t.goto
c19a721765 add exit_json
add exit_json code to succesfully exit, when you want to delete the already
deleted host.
Without this, playbook fails with
`Specify at least one group for creating host`
which is not correct message.
2016-03-15 16:19:08 +09:00
t.goto
f46e193718 change host.delete() parameter for newer ZBX api.
As of Zabbix API 2.4, host.delete() will not takes parameter with
`hostid` property but only the array of it.
https://www.zabbix.com/documentation/2.2/manual/api/reference/host/delete

fix #1800
2016-03-15 16:12:56 +09:00
Ritesh Khadgaray
1a29807e96 zabbix_host : add the ability to set inventory_mode 2016-03-14 22:27:44 +05:30
Brian Coca
083383a2c7 Merge pull request #1753 from eikef/issue1616
Fixes #1616, check whether interface-list exits before querying its length
2016-03-03 18:48:45 -05:00
Brian Coca
904b5938a0 Merge pull request #706 from eikef/devel
return as unchanged if macro update is unnecessary
2016-03-03 18:37:42 -05:00
Brian Coca
cb291d3f82 Merge pull request #1618 from plldp/devel
Update zabbix_host.py
2016-03-01 00:15:05 -05:00
Eike Frost
2810e6542a Replace deprecated exists API for Zabbix 3.0 compatibility 2016-02-29 22:58:23 +00:00
Calvin Walton
369af1c8c9 zabbix_maintenance: Stop using api removed in zabbix 3.0 2016-02-29 11:19:45 -05:00
Eike Frost
6acc369377 Check whether interface-list exits before querying its length 2016-02-28 20:12:01 +00:00
Eike Frost
47466242a3 Add explicit argument_spec types to avoid misinterpretation and subsequent errors (i.e. getting an int instead of the expected str) 2016-02-28 19:35:17 +00:00
Eike Frost
2a750bb8db return as unchanged if macro update is unnecessary 2016-02-25 01:52:34 +01:00
Miguel Martín
278b987017 Replace deprecated zabbix api method 'exists' to support zabbix 3.0 2016-02-19 20:01:08 +01:00
James Moore
a1af384274 Added a source parameter for setting the JIT client name 2016-02-17 18:04:39 -08:00
Ronny
7d79dff1d2 Update zabbix_host.py
Use existing proxy when updating a host unless proxy is specified. Before change proxy was always set to none(0) when updating.
2016-02-05 13:33:50 +01:00
Brian Coca
5b61c75fa5 added missing verison_added 2016-02-01 23:56:58 -05:00
Mstislav Bobakov
c4aa5ee024 Add custom parameter for a sensu_check. revert newline 2016-01-28 15:44:57 +03:00
Mstislav Bobakov
6ef3697c52 Add custom parameter for a sensu_check. Fixes.
JSON replaced within dict.
Added more docs.
2016-01-28 15:42:09 +03:00
Ryan G. Hunter
a59aa2cb34 monit startup fix 2016-01-21 10:56:58 -05:00
Mstislav Bobakov
8e35db0e38 Add custom parameter for a sensu_check 2016-01-21 13:08:25 +03:00
Brian Coca
3aa2d3744d Merge pull request #1482 from ansible/json-imports-fallback
Update for modules which import json.
2016-01-12 10:00:37 -05:00
Brian Coca
520d245ae7 added note on choice version availability 2016-01-11 19:06:44 -05:00
Brian Coca
4ca07d511e Merge pull request #1248 from hypergig/devel
support for event alert monitors
2016-01-11 19:01:36 -05:00
Toshio Kuratomi
d6af6f8477 Update for modules which import json.
Some do not use the json module directly so don't need import json.
Some needed to fallback to simplejson with no traceback if neither was installed

Fixes #1298
2016-01-11 13:06:22 -08:00
Michael Scherer
2f3dc1352f Replace choices=BOOLEANS by type='bool', fix #1326 2015-12-21 23:39:20 +01:00
Brian Coca
a6ceec998d corrected version_added for new monit timeout opt 2015-12-14 21:47:26 -05:00
Brian Coca
91df684902 Merge pull request #806 from gaqzi/monit/retry-option
monit: Add retry for pending/initializing services
2015-12-14 21:42:56 -05:00
Bruce Pennypacker
5abd7deab0 Remove extraneous space from end of command string in nagios_cmd 2015-12-11 16:06:33 +00:00
Michael Weber
fba8c9f8a7 Fix error 'fail_json() takes exactly 1 argument'
Fixes bug #1257
2015-12-01 01:56:23 -08:00
Björn Andersson
72155d40a3 monit: Set a high timeout waiting for status changes
Instead of waiting for up to a certain number of retries we set a high
timeout and only re-check every five seconds. Certain services can
take a minute or more to start and we want to avoid waisting resources
by polling too often.
2015-11-29 23:44:58 +08:00
Björn Andersson
262f2e9048 monit: Add version_added and type for new argument 2015-11-29 22:21:38 +08:00
Björn Andersson
5835d06a4e monit: Wait for pending state changes for reloads
@mpeters reported that we're not checking that the named service is
actually there after a reload. And that sometimes monit doesn't actually
return anything at all after a reload.
2015-11-29 22:21:38 +08:00