Allow specifying HTTP basic authentication credentials when writing t…

…o Elasticsearch (#754)

* Allow specifiying HTTP basic authentication credentials when writing to Elasticsearch.

- Tested against Elasticsearch 5.x
- Still backwards-compatible with 2.x (ignores the extra info)

* Allow specifying HTTP basic authentication credentials when writing to Elasticsearch.

- Tested against Elasticsearch 5.x w/X-Pack
- Still backwards-compatible with 2.x (ignores the extra info)

src/riemann/elasticsearch.clj

@@ -22,12 +22,15 @@
 
 (defn- post
   "POST to Elasticsearch."
-  [esindex formatted-event]
-  (let [http-options {:body (json/generate-string formatted-event)
-                      :content-type :json
-                      :conn-timeout 5000
-                      :socket-timeout 5000
-                      :throw-entire-message? true}]
+  [credentials esindex formatted-event]
+  (let [base-http-options {:body (json/generate-string formatted-event)
+                           :content-type :json
+                           :conn-timeout 5000
+                           :socket-timeout 5000
+                           :throw-entire-message? true}
+        http-options (if credentials
+                       (assoc base-http-options :basic-auth credentials)
+                       base-http-options)]
     (http/post esindex http-options)))
 
 (defn elasticsearch
@@ -41,6 +44,8 @@
   :es-index        Index name, default is \"riemann\".
   :index-suffix    Index-suffix, default is \"-yyyy.MM.dd\".
   :type            Type to send to index, default is \"event\".
+  :username        Username to authenticate with.
+  :password        Password to authenticate with.
 
   Example:
 
@@ -63,6 +68,8 @@
      event-formatter (if (first maybe-formatter) (first maybe-formatter) format-event)]
 
     (fn[event] (post
+                 (if (and (:username opts) (:password opts))
+                   [(:username opts) (:password opts)])
                  (format "%s/%s%s/%s"
                          (:es-endpoint opts)
                          (:es-index opts)

test/riemann/elasticsearch_test.clj

@@ -70,3 +70,43 @@
                  :conn-timeout 5000
                  :socket-timeout 5000
                  :throw-entire-message? true}]))))))
+
+(deftest ^:elasticsearch elasticsearch-valid-credentials-test
+  (with-mock [calls clj-http.client/post]
+    (let [elastic (elasticsearch {:es-endpoint "https://example-elastic.com"
+                                  :es-index "test-riemann"
+                                  :index-suffix "-yyyy.MM"
+                                  :type "test-type"
+                                  :username "foo"
+                                  :password "bar"})
+          json-event (json/generate-string output-event)]
+
+      (testing "correct basic-auth constructed from valid credentials"
+        (elastic input-event)
+        (is (= (last @calls)
+               ["https://example-elastic.com/test-riemann-2016.01/test-type"
+                {:body json-event
+                 :content-type :json
+                 :conn-timeout 5000
+                 :socket-timeout 5000
+                 :throw-entire-message? true
+                 :basic-auth ["foo" "bar"]}]))))))
+
+(deftest ^:elasticsearch elasticsearch-invalid-credentials-test
+  (with-mock [calls clj-http.client/post]
+    (let [elastic (elasticsearch {:es-endpoint "https://example-elastic.com"
+                                  :es-index "test-riemann"
+                                  :index-suffix "-yyyy.MM"
+                                  :type "test-type"
+                                  :username "foo"}) ; password is missing
+          json-event (json/generate-string output-event)]
+
+      (testing "invalid credentials are ignored"
+        (elastic input-event)
+        (is (= (last @calls)
+               ["https://example-elastic.com/test-riemann-2016.01/test-type"
+                {:body json-event
+                 :content-type :json
+                 :conn-timeout 5000
+                 :socket-timeout 5000
+                 :throw-entire-message? true}]))))))