diff --git a/diagrams/elastic/agent.py b/diagrams/elastic/agent.py
new file mode 100644
index 00000000..518d728d
--- /dev/null
+++ b/diagrams/elastic/agent.py
@@ -0,0 +1,27 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Elastic
+
+
+class _Agent(_Elastic):
+    _type = "agent"
+    _icon_dir = "resources/elastic/agent"
+
+
+class Agent(_Agent):
+    _icon = "agent.png"
+
+
+class Endpoint(_Agent):
+    _icon = "endpoint.png"
+
+
+class Fleet(_Agent):
+    _icon = "fleet.png"
+
+
+class Integrations(_Agent):
+    _icon = "integrations.png"
+
+
+# Aliases
diff --git a/diagrams/elastic/beats.py b/diagrams/elastic/beats.py
new file mode 100644
index 00000000..f4a59600
--- /dev/null
+++ b/diagrams/elastic/beats.py
@@ -0,0 +1,43 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Elastic
+
+
+class _Beats(_Elastic):
+    _type = "beats"
+    _icon_dir = "resources/elastic/beats"
+
+
+class APM(_Beats):
+    _icon = "apm.png"
+
+
+class Auditbeat(_Beats):
+    _icon = "auditbeat.png"
+
+
+class Filebeat(_Beats):
+    _icon = "filebeat.png"
+
+
+class Functionbeat(_Beats):
+    _icon = "functionbeat.png"
+
+
+class Heartbeat(_Beats):
+    _icon = "heartbeat.png"
+
+
+class Metricbeat(_Beats):
+    _icon = "metricbeat.png"
+
+
+class Packetbeat(_Beats):
+    _icon = "packetbeat.png"
+
+
+class Winlogbeat(_Beats):
+    _icon = "winlogbeat.png"
+
+
+# Aliases
diff --git a/diagrams/elastic/elasticsearch.py b/diagrams/elastic/elasticsearch.py
index dad072ba..eec16b7a 100644
--- a/diagrams/elastic/elasticsearch.py
+++ b/diagrams/elastic/elasticsearch.py
@@ -24,6 +24,10 @@ class Kibana(_Elasticsearch):
     _icon = "kibana.png"
 
 
+class LogstashPipeline(_Elasticsearch):
+    _icon = "logstash-pipeline.png"
+
+
 class Logstash(_Elasticsearch):
     _icon = "logstash.png"
 
@@ -32,6 +36,10 @@ class MachineLearning(_Elasticsearch):
     _icon = "machine-learning.png"
 
 
+class MapServices(_Elasticsearch):
+    _icon = "map-services.png"
+
+
 class Maps(_Elasticsearch):
     _icon = "maps.png"
 
@@ -40,6 +48,10 @@ class Monitoring(_Elasticsearch):
     _icon = "monitoring.png"
 
 
+class SearchableSnapshots(_Elasticsearch):
+    _icon = "searchable-snapshots.png"
+
+
 class SecuritySettings(_Elasticsearch):
     _icon = "security-settings.png"
 
@@ -48,6 +60,10 @@ class Sql(_Elasticsearch):
     _icon = "sql.png"
 
 
+class Stack(_Elasticsearch):
+    _icon = "stack.png"
+
+
 # Aliases
 
 LogStash = Logstash
diff --git a/diagrams/elastic/enterprisesearch.py b/diagrams/elastic/enterprisesearch.py
index d5e19459..cde3ca60 100644
--- a/diagrams/elastic/enterprisesearch.py
+++ b/diagrams/elastic/enterprisesearch.py
@@ -12,6 +12,10 @@ class AppSearch(_Enterprisesearch):
     _icon = "app-search.png"
 
 
+class Crawler(_Enterprisesearch):
+    _icon = "crawler.png"
+
+
 class EnterpriseSearch(_Enterprisesearch):
     _icon = "enterprise-search.png"
 
diff --git a/diagrams/elastic/security.py b/diagrams/elastic/security.py
index 34afe3e0..bf907c32 100644
--- a/diagrams/elastic/security.py
+++ b/diagrams/elastic/security.py
@@ -20,4 +20,8 @@ class SIEM(_Security):
     _icon = "siem.png"
 
 
+class Xdr(_Security):
+    _icon = "xdr.png"
+
+
 # Aliases
diff --git a/docs/nodes/elastic.md b/docs/nodes/elastic.md
index 2601bf0a..a24d046b 100644
--- a/docs/nodes/elastic.md
+++ b/docs/nodes/elastic.md
@@ -5,6 +5,48 @@ title: Elastic
 
 Node classes list of elastic provider.
 
+## elastic.agent
+
+
+<img width="30" src="/img/resources/elastic/agent/agent.png" alt="Agent" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.agent.Agent**
+
+<img width="30" src="/img/resources/elastic/agent/endpoint.png" alt="Endpoint" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.agent.Endpoint**
+
+<img width="30" src="/img/resources/elastic/agent/fleet.png" alt="Fleet" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.agent.Fleet**
+
+<img width="30" src="/img/resources/elastic/agent/integrations.png" alt="Integrations" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.agent.Integrations**
+
+## elastic.beats
+
+
+<img width="30" src="/img/resources/elastic/beats/apm.png" alt="APM" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.beats.APM**
+
+<img width="30" src="/img/resources/elastic/beats/auditbeat.png" alt="Auditbeat" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.beats.Auditbeat**
+
+<img width="30" src="/img/resources/elastic/beats/filebeat.png" alt="Filebeat" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.beats.Filebeat**
+
+<img width="30" src="/img/resources/elastic/beats/functionbeat.png" alt="Functionbeat" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.beats.Functionbeat**
+
+<img width="30" src="/img/resources/elastic/beats/heartbeat.png" alt="Heartbeat" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.beats.Heartbeat**
+
+<img width="30" src="/img/resources/elastic/beats/metricbeat.png" alt="Metricbeat" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.beats.Metricbeat**
+
+<img width="30" src="/img/resources/elastic/beats/packetbeat.png" alt="Packetbeat" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.beats.Packetbeat**
+
+<img width="30" src="/img/resources/elastic/beats/winlogbeat.png" alt="Winlogbeat" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.beats.Winlogbeat**
+
 ## elastic.elasticsearch
 
 
@@ -20,30 +62,45 @@ Node classes list of elastic provider.
 <img width="30" src="/img/resources/elastic/elasticsearch/kibana.png" alt="Kibana" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.Kibana**
 
+<img width="30" src="/img/resources/elastic/elasticsearch/logstash-pipeline.png" alt="LogstashPipeline" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.elasticsearch.LogstashPipeline**
+
 <img width="30" src="/img/resources/elastic/elasticsearch/logstash.png" alt="Logstash" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.Logstash**, **LogStash** (alias)
 
 <img width="30" src="/img/resources/elastic/elasticsearch/machine-learning.png" alt="MachineLearning" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.MachineLearning**
 
+<img width="30" src="/img/resources/elastic/elasticsearch/map-services.png" alt="MapServices" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.elasticsearch.MapServices**
+
 <img width="30" src="/img/resources/elastic/elasticsearch/maps.png" alt="Maps" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.Maps**
 
 <img width="30" src="/img/resources/elastic/elasticsearch/monitoring.png" alt="Monitoring" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.Monitoring**
 
+<img width="30" src="/img/resources/elastic/elasticsearch/searchable-snapshots.png" alt="SearchableSnapshots" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.elasticsearch.SearchableSnapshots**
+
 <img width="30" src="/img/resources/elastic/elasticsearch/security-settings.png" alt="SecuritySettings" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.SecuritySettings**
 
 <img width="30" src="/img/resources/elastic/elasticsearch/sql.png" alt="Sql" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.elasticsearch.Sql**
 
+<img width="30" src="/img/resources/elastic/elasticsearch/stack.png" alt="Stack" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.elasticsearch.Stack**
+
 ## elastic.enterprisesearch
 
 
 <img width="30" src="/img/resources/elastic/enterprisesearch/app-search.png" alt="AppSearch" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.enterprisesearch.AppSearch**
 
+<img width="30" src="/img/resources/elastic/enterprisesearch/crawler.png" alt="Crawler" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.enterprisesearch.Crawler**
+
 <img width="30" src="/img/resources/elastic/enterprisesearch/enterprise-search.png" alt="EnterpriseSearch" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.enterprisesearch.EnterpriseSearch**
 
@@ -100,3 +157,6 @@ Node classes list of elastic provider.
 
 <img width="30" src="/img/resources/elastic/security/siem.png" alt="SIEM" style="float: left; padding-right: 5px;" >
 **diagrams.elastic.security.SIEM**
+
+<img width="30" src="/img/resources/elastic/security/xdr.png" alt="Xdr" style="float: left; padding-right: 5px;" >
+**diagrams.elastic.security.Xdr**
diff --git a/resources/elastic/agent/agent.png b/resources/elastic/agent/agent.png
new file mode 100644
index 00000000..f2a90e0d
Binary files /dev/null and b/resources/elastic/agent/agent.png differ
diff --git a/resources/elastic/agent/endpoint.png b/resources/elastic/agent/endpoint.png
new file mode 100644
index 00000000..4daf3ca3
Binary files /dev/null and b/resources/elastic/agent/endpoint.png differ
diff --git a/resources/elastic/agent/fleet.png b/resources/elastic/agent/fleet.png
new file mode 100644
index 00000000..55dd3686
Binary files /dev/null and b/resources/elastic/agent/fleet.png differ
diff --git a/resources/elastic/agent/integrations.png b/resources/elastic/agent/integrations.png
new file mode 100644
index 00000000..9bd75395
Binary files /dev/null and b/resources/elastic/agent/integrations.png differ
diff --git a/resources/elastic/beats/apm.png b/resources/elastic/beats/apm.png
new file mode 100644
index 00000000..fdb5796a
Binary files /dev/null and b/resources/elastic/beats/apm.png differ
diff --git a/resources/elastic/beats/auditbeat.png b/resources/elastic/beats/auditbeat.png
new file mode 100644
index 00000000..4e41ae78
Binary files /dev/null and b/resources/elastic/beats/auditbeat.png differ
diff --git a/resources/elastic/beats/filebeat.png b/resources/elastic/beats/filebeat.png
new file mode 100644
index 00000000..778af3d3
Binary files /dev/null and b/resources/elastic/beats/filebeat.png differ
diff --git a/resources/elastic/beats/functionbeat.png b/resources/elastic/beats/functionbeat.png
new file mode 100644
index 00000000..080e9f46
Binary files /dev/null and b/resources/elastic/beats/functionbeat.png differ
diff --git a/resources/elastic/beats/heartbeat.png b/resources/elastic/beats/heartbeat.png
new file mode 100644
index 00000000..975daa7b
Binary files /dev/null and b/resources/elastic/beats/heartbeat.png differ
diff --git a/resources/elastic/beats/metricbeat.png b/resources/elastic/beats/metricbeat.png
new file mode 100644
index 00000000..80082cd4
Binary files /dev/null and b/resources/elastic/beats/metricbeat.png differ
diff --git a/resources/elastic/beats/packetbeat.png b/resources/elastic/beats/packetbeat.png
new file mode 100644
index 00000000..9ede7e1e
Binary files /dev/null and b/resources/elastic/beats/packetbeat.png differ
diff --git a/resources/elastic/beats/winlogbeat.png b/resources/elastic/beats/winlogbeat.png
new file mode 100644
index 00000000..70f12acb
Binary files /dev/null and b/resources/elastic/beats/winlogbeat.png differ
diff --git a/resources/elastic/elasticsearch/logstash-pipeline.png b/resources/elastic/elasticsearch/logstash-pipeline.png
new file mode 100644
index 00000000..4a772456
Binary files /dev/null and b/resources/elastic/elasticsearch/logstash-pipeline.png differ
diff --git a/resources/elastic/elasticsearch/map-services.png b/resources/elastic/elasticsearch/map-services.png
new file mode 100644
index 00000000..774d0c3c
Binary files /dev/null and b/resources/elastic/elasticsearch/map-services.png differ
diff --git a/resources/elastic/elasticsearch/searchable-snapshots.png b/resources/elastic/elasticsearch/searchable-snapshots.png
new file mode 100644
index 00000000..3fdd73d9
Binary files /dev/null and b/resources/elastic/elasticsearch/searchable-snapshots.png differ
diff --git a/resources/elastic/elasticsearch/stack.png b/resources/elastic/elasticsearch/stack.png
new file mode 100644
index 00000000..71e6651b
Binary files /dev/null and b/resources/elastic/elasticsearch/stack.png differ
diff --git a/resources/elastic/enterprisesearch/crawler.png b/resources/elastic/enterprisesearch/crawler.png
new file mode 100644
index 00000000..555801d0
Binary files /dev/null and b/resources/elastic/enterprisesearch/crawler.png differ
diff --git a/resources/elastic/observability/observability.png b/resources/elastic/observability/observability.png
index 5844caa9..f4408894 100644
Binary files a/resources/elastic/observability/observability.png and b/resources/elastic/observability/observability.png differ
diff --git a/resources/elastic/security/xdr.png b/resources/elastic/security/xdr.png
new file mode 100644
index 00000000..972f1f16
Binary files /dev/null and b/resources/elastic/security/xdr.png differ