(#134) Clean onprem elastic

README.md

@@ -74,6 +74,15 @@ To contribute to diagram, check out [contribution guidelines](CONTRIBUTING.md).
 
 [Cloudiscovery](https://github.com/Cloud-Architects/cloudiscovery) helps you to analyze resources in your cloud (AWS/GCP/Azure/Alibaba/IBM) account. It allows you to create a diagram of analyzed cloud resource map based on this Diagrams library, so you can draw the your existing cloud infratructure with Cloudicovery.
 
+## Breaking Changes
+
+- version 0.16.0:
+  - The following import changes:
+    - from diagrams.onprem.logging import Logstash is now from diagrams.elastic.elasticsearch import Logstash
+    - from diagrams.onprem.monitoring import Kibana is now from diagrams.elastic.elasticsearch import Kibana
+    - from diagrams.onprem.search import Elasticsearch(*) is now from diagrams.elastic.elasticsearch import Elasticsearch
+    *The previous icon was the company icon not the elasticsearch product, for the company icon: from diagrams.elastic.saas import Elastic
+
 ## License
 
 [MIT](LICENSE)

config.py

@@ -116,7 +116,6 @@ ALIASES = {
         },
         "logging": {
             "Fluentbit": "FluentBit",
-            "Logstash": "LogStash",
         },
         "network": {
             "Etcd": "ETCD",

diagrams/elastic/saas.py

@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Elastic
+
+
+class _Saas(_Elastic):
+    _type = "saas"
+    _icon_dir = "resources/elastic/saas"
+
+
+class Cloud(_Saas):
+    _icon = "cloud.png"
+
+
+class Elastic(_Saas):
+    _icon = "elastic.png"
+
+
+# Aliases

diagrams/onprem/logging.py

@@ -16,10 +16,6 @@ class Fluentd(_Logging):
     _icon = "fluentd.png"
 
 
-class Logstash(_Logging):
-    _icon = "logstash.png"
-
-
 class Loki(_Logging):
     _icon = "loki.png"
 
@@ -27,4 +23,3 @@ class Loki(_Logging):
 # Aliases
 
 FluentBit = Fluentbit
-LogStash = Logstash

diagrams/onprem/monitoring.py

@@ -16,10 +16,6 @@ class Grafana(_Monitoring):
     _icon = "grafana.png"
 
 
-class Kibana(_Monitoring):
-    _icon = "kibana.png"
-
-
 class Prometheus(_Monitoring):
     _icon = "prometheus.png"
 

diagrams/onprem/search.py

@@ -8,10 +8,6 @@ class _Search(_OnPrem):
     _icon_dir = "resources/onprem/search"
 
 
-class Elasticsearch(_Search):
-    _icon = "elasticsearch.png"
-
-
 class Solr(_Search):
     _icon = "solr.png"
 

docs/nodes/elastic.md

@@ -38,6 +38,11 @@ Node classes list of elastic provider.
 - **diagrams.elastic.orchestration.ECE**
 - **diagrams.elastic.orchestration.ECK**
 
+## elastic.saas
+
+- **diagrams.elastic.saas.Cloud**
+- **diagrams.elastic.saas.Elastic**
+
 ## elastic.security
 
 - **diagrams.elastic.security.Endpoint**

docs/nodes/onprem.md

@@ -98,7 +98,6 @@ Node classes list of onprem provider.
 
 - **diagrams.onprem.logging.Fluentbit**, **FluentBit** (alias)
 - **diagrams.onprem.logging.Fluentd**
-- **diagrams.onprem.logging.Logstash**, **LogStash** (alias)
 - **diagrams.onprem.logging.Loki**
 
 ## onprem.mlops
@@ -109,7 +108,6 @@ Node classes list of onprem provider.
 
 - **diagrams.onprem.monitoring.Datadog**
 - **diagrams.onprem.monitoring.Grafana**
-- **diagrams.onprem.monitoring.Kibana**
 - **diagrams.onprem.monitoring.Prometheus**
 - **diagrams.onprem.monitoring.Sentry**
 - **diagrams.onprem.monitoring.Splunk**
@@ -145,7 +143,6 @@ Node classes list of onprem provider.
 
 ## onprem.search
 
-- **diagrams.onprem.search.Elasticsearch**
 - **diagrams.onprem.search.Solr**
 
 ## onprem.security