From feb48f44869f7aab9194da81d11e8700fe1cb7dc Mon Sep 17 00:00:00 2001 From: Neil Cook Date: Fri, 23 Nov 2018 11:25:38 +0000 Subject: [PATCH 1/5] Remove redundant retval variable --- ext/ext/threadname.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ext/ext/threadname.cc b/ext/ext/threadname.cc index 8dc96f5c..59490448 100644 --- 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 } From bcb13345276c6f865eace90ba455154be71e3ebe Mon Sep 17 00:00:00 2001 From: Neil Cook Date: Fri, 23 Nov 2018 11:26:23 +0000 Subject: [PATCH 2/5] xpack plugin removal no longer works --- docker/elasticsearch/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/elasticsearch/Dockerfile b/docker/elasticsearch/Dockerfile index 5a81880f..6fc90343 100644 --- 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 From 4ea66ce7fe0d7c891e6319075ea6fb1b6274bfb8 Mon Sep 17 00:00:00 2001 From: Neil Cook Date: Fri, 23 Nov 2018 11:26:43 +0000 Subject: [PATCH 3/5] logstash runs on the normal port not 18080 anymore --- gendata/wforce_elastic.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gendata/wforce_elastic.conf b/gendata/wforce_elastic.conf index 36cdf984..f4dc217f 100644 --- 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) From f8121138f7993ae2ddcfa16bedba76bbd70a0177 Mon Sep 17 00:00:00 2001 From: Neil Cook Date: Fri, 23 Nov 2018 13:15:58 +0000 Subject: [PATCH 4/5] Add kibana reports and dashboards to src dist --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index cb5caeea..fb878b8f 100644 --- 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) From 771903467c3bbe91ab6848cc827e64ef22fa51e5 Mon Sep 17 00:00:00 2001 From: Neil Cook Date: Fri, 23 Nov 2018 13:16:49 +0000 Subject: [PATCH 5/5] Add kibana reports and dashboards to built packages --- builder-support/debian/wforce.docs | 1 + builder-support/specs/wforce.spec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/builder-support/debian/wforce.docs b/builder-support/debian/wforce.docs index b494daa2..f23b9d69 100644 --- 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 index 34727a9b..38f68b0f 100644 --- 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