Merge pull request #3168 from DataDog/hamano_riak_security

Hamano riak security
DataDog · Feb 2, 2017 · 1ecbe45 · 1ecbe45
2 parents c4d1e8e + 14563ca
commit 1ecbe45
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/checks.d/riak.py b/checks.d/riak.py
@@ -82,11 +82,15 @@ def check(self, instance):
         url = instance['url']
         default_timeout = self.init_config.get('default_timeout', 5)
         timeout = float(instance.get('timeout', default_timeout))
+        cacert = instance.get('cacert', None)
+        disable_cert_verify = instance.get('disable_cert_verify', False)
         tags = instance.get('tags', [])
         service_check_tags = tags + ['url:%s' % url]
 
         try:
-            h = Http(timeout=timeout)
+            h = Http(timeout=timeout,
+                     ca_certs=cacert,
+                     disable_ssl_certificate_validation=disable_cert_verify)
             resp, content = h.request(url, "GET")
         except (socket.timeout, socket.error, HttpLib2Error) as e:
             self.service_check(self.SERVICE_CHECK_NAME, AgentCheck.CRITICAL,

diff --git a/conf.d/riak.yaml.example b/conf.d/riak.yaml.example
@@ -2,6 +2,8 @@ init_config:
 
 instances:
   - url: http://127.0.0.1:8098/stats
+    # cacert: /path/to/ca.pem
+    # disable_cert_verify: false
     # tags:
     #  - optional_tag1
     #  - optional_tag2