From 944d61bf63f8c8c30b65a3eef145214eb6309dc8 Mon Sep 17 00:00:00 2001
From: tessier <tessier@luxeys.com>
Date: Sun, 5 Jul 2020 11:35:18 +0900
Subject: [PATCH] (#134) Clean onprem elastic

---
 README.md                                     |   9 +++++++++
 config.py                                     |   1 -
 diagrams/elastic/saas.py                      |  19 ++++++++++++++++++
 diagrams/onprem/logging.py                    |   5 -----
 diagrams/onprem/monitoring.py                 |   4 ----
 diagrams/onprem/search.py                     |   4 ----
 docs/nodes/elastic.md                         |   5 +++++
 docs/nodes/onprem.md                          |   3 ---
 resources/elastic/{ => saas}/cloud.png        | Bin
 .../saas/elastic.png}                         | Bin
 resources/onprem/logging/logstash.png         | Bin 1883 -> 0 bytes
 resources/onprem/monitoring/kibana.png        | Bin 3266 -> 0 bytes
 12 files changed, 33 insertions(+), 17 deletions(-)
 create mode 100644 diagrams/elastic/saas.py
 rename resources/elastic/{ => saas}/cloud.png (100%)
 rename resources/{onprem/search/elasticsearch.png => elastic/saas/elastic.png} (100%)
 delete mode 100644 resources/onprem/logging/logstash.png
 delete mode 100644 resources/onprem/monitoring/kibana.png

diff --git a/README.md b/README.md
index e22e2d53..32c7fd82 100644
--- a/README.md
+++ b/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)
diff --git a/config.py b/config.py
index b8ae14c6..726c58f2 100644
--- a/config.py
+++ b/config.py
@@ -116,7 +116,6 @@ ALIASES = {
         },
         "logging": {
             "Fluentbit": "FluentBit",
-            "Logstash": "LogStash",
         },
         "network": {
             "Etcd": "ETCD",
diff --git a/diagrams/elastic/saas.py b/diagrams/elastic/saas.py
new file mode 100644
index 00000000..4821d62f
--- /dev/null
+++ b/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
diff --git a/diagrams/onprem/logging.py b/diagrams/onprem/logging.py
index ed96385d..a78d9cef 100644
--- a/diagrams/onprem/logging.py
+++ b/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
diff --git a/diagrams/onprem/monitoring.py b/diagrams/onprem/monitoring.py
index cbabfce7..cd1d2998 100644
--- a/diagrams/onprem/monitoring.py
+++ b/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"
 
diff --git a/diagrams/onprem/search.py b/diagrams/onprem/search.py
index 5e33a156..da5f0b4e 100644
--- a/diagrams/onprem/search.py
+++ b/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"
 
diff --git a/docs/nodes/elastic.md b/docs/nodes/elastic.md
index cbe65932..28ed1e2e 100644
--- a/docs/nodes/elastic.md
+++ b/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**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 51a46aec..52b311bd 100644
--- a/docs/nodes/onprem.md
+++ b/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
diff --git a/resources/elastic/cloud.png b/resources/elastic/saas/cloud.png
similarity index 100%
rename from resources/elastic/cloud.png
rename to resources/elastic/saas/cloud.png
diff --git a/resources/onprem/search/elasticsearch.png b/resources/elastic/saas/elastic.png
similarity index 100%
rename from resources/onprem/search/elasticsearch.png
rename to resources/elastic/saas/elastic.png
diff --git a/resources/onprem/logging/logstash.png b/resources/onprem/logging/logstash.png
deleted file mode 100644
index 5b23370b59df96ca51f69586d525c517f6344820..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1883
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

diff --git a/resources/onprem/monitoring/kibana.png b/resources/onprem/monitoring/kibana.png
deleted file mode 100644
index c7be5244742cfba0a36923b394cda5b1aa69cb32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3266
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
bocI14tAZX=KC8|ES5cho-RvG8Ja+Ma+9d^D