Merge pull request #528 from cloudnull/remove-elasticsearch

Remove the elasticsearch maas check
rcbops · Jul 24, 2018 · f17a91a · f17a91a
2 parents c98854d + 78b532c
commit f17a91a
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 321 deletions.
diff --git a/doc/maas-checks/source/maas_checks_config.py b/doc/maas-checks/source/maas_checks_config.py
@@ -163,9 +163,7 @@ def _get_globals(config_variables):
     # configured list.
     # NOTE: Don't copy config_variables into new_globals wholesale as we
     # want things such as alarm criteria to remain as actual template values.
-    for name in ("elasticsearch_process_names",
-                 "ceph_radosgw_protocol",
-                 "filebeat_process_names",
+    for name in ("ceph_radosgw_protocol",
                  "rsyslogd_process_names",
                  "maas_swift_account_process_names",
                  "maas_swift_container_process_names",

diff --git a/doc/source/static-inventory.rst b/doc/source/static-inventory.rst
@@ -135,21 +135,6 @@ section
     osds
 
 
-elasticsearch_all
-~~~~~~~~~~~~~~~~~
-
-If you have node(s) running ``elasticsearch``, add the node(s) into the
-"elasticsearch" section
-
-.. code-block:: ini
-
-    [elasticsearch]
-    infra1
-
-    [elasticsearch_all:children]
-    elasticsearch
-
-
 rsyslog_all
 ~~~~~~~~~~~
 

diff --git a/playbooks/files/rax-maas/plugins/elasticsearch.py b/playbooks/files/rax-maas/plugins/elasticsearch.py
diff --git a/playbooks/maas-infra-all.yml b/playbooks/maas-infra-all.yml
@@ -13,14 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: maas-infra-elasticsearch.yml
-  tags:
-    - maas-infra
-
-- include: maas-infra-filebeat.yml
-  tags:
-    - maas-infra
-
 - include: maas-infra-galera.yml
   tags:
     - maas-infra

diff --git a/playbooks/maas-infra-elasticsearch.yml b/playbooks/maas-infra-elasticsearch.yml
diff --git a/playbooks/maas-infra-filebeat.yml b/playbooks/maas-infra-filebeat.yml
diff --git a/playbooks/templates/common/macros.jinja b/playbooks/templates/common/macros.jinja
@@ -3,7 +3,7 @@
 api
 {% elif check_label.startswith('managed_k8') %}
 kubernetes
-{% elif check_label in ['elasticsearch_process_check', 'filebeat_process_check'] or check_label.startswith('rsyslogd_process_check') %}
+{% elif check_label.startswith('rsyslogd_process_check') %}
 logging
 {% elif check_label in ['container_storage_check', 'holland_local_check', 'maas_poller_fd_count', 'memcached_status'] or check_label.startswith('galera') or check_label.startswith('rabbitmq') %}
 infrastructure

diff --git a/playbooks/templates/rax-maas/elasticsearch_process_check.yaml.j2 b/playbooks/templates/rax-maas/elasticsearch_process_check.yaml.j2
diff --git a/playbooks/templates/rax-maas/filebeat_process_check.yaml.j2 b/playbooks/templates/rax-maas/filebeat_process_check.yaml.j2
diff --git a/playbooks/vars/maas-infra.yml b/playbooks/vars/maas-infra.yml
@@ -13,12 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-elasticsearch_process_names:
-  - java
-
-filebeat_process_names:
-  - filebeat
-
 maas_holland_venv_bin: "/openstack/venvs/holland-{{ rpc_release }}/bin"
 maas_mysql_connection_warning_threshold: 80
 maas_mysql_connection_critical_threshold: 90

diff --git a/releasenotes/notes/remove-elasticsearch-3ad96fe1e81f3383.yaml b/releasenotes/notes/remove-elasticsearch-3ad96fe1e81f3383.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The elasticsearch maas check is not doing a whole lot and is more noise
+    than value. This is on top of the fact that the elasticsearch checks are
+    not made for a deployment where elasticsearch/logstash are deployed in a
+    high performance cluster. This change also removes the filebeat check.