From c790ac47d5a7f3f176097614d3c2c5ed15f741e5 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Sat, 3 Oct 2020 15:28:34 +0200 Subject: [PATCH] add(node): Vector aggregator service (#295) * Add: Vector logging service Signed-off-by: Nicolas Lamirault * Update: move fluentd and vector into aggregator category Signed-off-by: Nicolas Lamirault --- diagrams/onprem/aggregator.py | 19 ++++++++++++++++++ diagrams/onprem/logging.py | 4 ---- diagrams/onprem/network.py | 1 + docs/nodes/onprem.md | 6 +++++- .../{logging => aggregator}/fluentd.png | Bin resources/onprem/aggregator/vector.png | Bin 0 -> 7830 bytes 6 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 diagrams/onprem/aggregator.py rename resources/onprem/{logging => aggregator}/fluentd.png (100%) create mode 100644 resources/onprem/aggregator/vector.png diff --git a/diagrams/onprem/aggregator.py b/diagrams/onprem/aggregator.py new file mode 100644 index 00000000..01f3c77a --- /dev/null +++ b/diagrams/onprem/aggregator.py @@ -0,0 +1,19 @@ +# This module is automatically generated by autogen.sh. DO NOT EDIT. + +from . import _OnPrem + + +class _Aggregator(_OnPrem): + _type = "aggregator" + _icon_dir = "resources/onprem/aggregator" + + +class Fluentd(_Aggregator): + _icon = "fluentd.png" + + +class Vector(_Aggregator): + _icon = "vector.png" + + +# Aliases diff --git a/diagrams/onprem/logging.py b/diagrams/onprem/logging.py index 48babb65..f56b2339 100644 --- a/diagrams/onprem/logging.py +++ b/diagrams/onprem/logging.py @@ -12,10 +12,6 @@ class Fluentbit(_Logging): _icon = "fluentbit.png" -class Fluentd(_Logging): - _icon = "fluentd.png" - - class Graylog(_Logging): _icon = "graylog.png" diff --git a/diagrams/onprem/network.py b/diagrams/onprem/network.py index 46879804..ae91ea4f 100644 --- a/diagrams/onprem/network.py +++ b/diagrams/onprem/network.py @@ -121,5 +121,6 @@ class Zookeeper(_Network): ETCD = Etcd HAProxy = Haproxy OSM = OpenServiceMesh +OPNSense = Opnsense PFSense = Pfsense VyOS = Vyos diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md index a519be55..014a8fd1 100644 --- a/docs/nodes/onprem.md +++ b/docs/nodes/onprem.md @@ -5,6 +5,11 @@ title: OnPrem Node classes list of onprem provider. +## onprem.aggregator + +- **diagrams.onprem.aggregator.Fluentd** +- **diagrams.onprem.aggregator.Vector** + ## onprem.analytics - **diagrams.onprem.analytics.Beam** @@ -107,7 +112,6 @@ Node classes list of onprem provider. ## onprem.logging - **diagrams.onprem.logging.Fluentbit**, **FluentBit** (alias) -- **diagrams.onprem.logging.Fluentd** - **diagrams.onprem.logging.Graylog** - **diagrams.onprem.logging.Loki** - **diagrams.onprem.logging.Rsyslog**, **RSyslog** (alias) diff --git a/resources/onprem/logging/fluentd.png b/resources/onprem/aggregator/fluentd.png similarity index 100% rename from resources/onprem/logging/fluentd.png rename to resources/onprem/aggregator/fluentd.png diff --git a/resources/onprem/aggregator/vector.png b/resources/onprem/aggregator/vector.png new file mode 100644 index 0000000000000000000000000000000000000000..a1ea5a4454eefb49c7808d55dc93d7724e2cd64e GIT binary patch literal 7830 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