Merge pull request #241 from neilcook/elk

Elk
PowerDNS · Nov 26, 2018 · e64f05b · e64f05b
2 parents 8dcee47 + 7719034
commit e64f05b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -9,6 +9,6 @@ endif
 
 SUBDIRS=ext docs common wforce report_api $(BUILD_TRACKALERT) $(BUILD_DOCKER)
 
-LOGSTASH_DIST = elk/logstash/config/logstash.conf elk/logstash/templates/wforce_template.json
+LOGSTASH_DIST = elk/logstash/config/logstash.conf elk/logstash/templates/wforce_template.json elk/kibana/kibana_saved_objects.json
 
 EXTRA_DIST= README.md LICENSE CHANGELOG.md $(LOGSTASH_DIST)
diff --git a/builder-support/debian/wforce.docs b/builder-support/debian/wforce.docs
@@ -3,3 +3,4 @@ LICENSE
 CHANGELOG.md
 elk/logstash/config/logstash.conf
 elk/logstash/templates/wforce_template.json
+elk/kibana/kibana_saved_objects.json
diff --git a/builder-support/specs/wforce.spec b/builder-support/specs/wforce.spec
@@ -105,6 +105,7 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/report_api/instance
 mv %{buildroot}/etc/%{name}/%{name}.conf.example %{buildroot}/%{_docdir}/%{name}-%{version}/
 mv elk/logstash/config/logstash.conf %{buildroot}/%{_docdir}/%{name}-%{version}/
 mv elk/logstash/templates/wforce_template.json %{buildroot}/%{_docdir}/%{name}-%{version}/
+mv elk/kibana/kibana_saved_objects.json %{buildroot}/%{_docdir}/%{name}-%{version}/
 mv report_api/wforce/__init__.py %{buildroot}/%{_datadir}/%{name}/report_api/wforce/__init__.py
 mv report_api/wforce/report.py %{buildroot}/%{_datadir}/%{name}/report_api/wforce/report.py
 mv report_api/instance/report.cfg %{buildroot}/%{_datadir}/%{name}/report_api/instance/report.cfg
@@ -276,6 +277,7 @@ fi
 %{_docdir}/%{name}-%{version}/%{name}.conf.example
 %{_docdir}/%{name}-%{version}/logstash.conf
 %{_docdir}/%{name}-%{version}/wforce_template.json
+%{_docdir}/%{name}-%{version}/kibana_saved_objects.json
 %{_unitdir}/%{name}.service
 %{_mandir}/man1/%{name}.1.gz
 %{_mandir}/man5/%{name}.conf.5.gz

diff --git a/docker/elasticsearch/Dockerfile b/docker/elasticsearch/Dockerfile
@@ -1,3 +1,2 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.2.0
-RUN bin/elasticsearch-plugin remove x-pack
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.0
 RUN sed -i '/xpack/d' /usr/share/elasticsearch/config/elasticsearch.yml
diff --git a/ext/ext/threadname.cc b/ext/ext/threadname.cc
@@ -34,22 +34,20 @@
 #include "threadname.hh"
 
 void setThreadName(const std::string& threadName) {
-  int retval = 0;
-
 #ifdef HAVE_PTHREAD_SETNAME_NP_2
-  retval = pthread_setname_np(pthread_self(), threadName.c_str());
+  pthread_setname_np(pthread_self(), threadName.c_str());
 #endif
 #ifdef HAVE_PTHREAD_SET_NAME_NP_2
-  retval = pthread_set_name_np(pthread_self(), threadName.c_str());
+  pthread_set_name_np(pthread_self(), threadName.c_str());
 #endif
 #ifdef HAVE_PTHREAD_SET_NAME_NP_2_VOID
   pthread_set_name_np(pthread_self(), threadName.c_str());
 #endif
 #ifdef HAVE_PTHREAD_SETNAME_NP_1
-  retval = pthread_setname_np(threadName.c_str());
+  pthread_setname_np(threadName.c_str());
 #endif
 #ifdef HAVE_PTHREAD_SETNAME_NP_3
-  retval = pthread_setname_np(pthread_self(), threadName.c_str(), nullptr);
+  pthread_setname_np(pthread_self(), threadName.c_str(), nullptr);
 #endif
 }
 
diff --git a/gendata/wforce_elastic.conf b/gendata/wforce_elastic.conf
@@ -7,7 +7,7 @@ addACL("192.168.0.0/16")
 
 --addNamedReportSink("logstash", "127.0.0.1:14501")
 config_keys = {}
-config_keys["url"] = "http://127.0.0.1:18080"
+config_keys["url"] = "http://127.0.0.1:8080"
 config_keys["secret"] = "verysecretcode"
 addWebHook({"report"}, config_keys)