From 2a607922723adaccee0c0cc730d670c07284e5a0 Mon Sep 17 00:00:00 2001 From: Mykhailo Semenchenko Date: Wed, 1 Nov 2023 11:21:38 +0100 Subject: [PATCH 1/5] Add tags for filtering --- configs/1-1-localhost-windows-system.json | 4 +++- configs/1-2-localhost-linux-system.json | 2 ++ configs/1-3-localhost-mac-system.json | 2 ++ configs/2-1-k8s-eks.json | 2 ++ configs/2-2-k8s-aks.json | 2 ++ configs/2-3-k8s-gke.json | 2 ++ configs/2-4-k8s-digitalocean.json | 2 ++ configs/3-1-aws-cw.json | 5 +++-- configs/3-2-aws-metric-stream.json | 3 ++- configs/3-3-aws-ec2-linux-system.json | 3 ++- configs/4-1-gcp-logs.json | 2 ++ configs/4-2-gcp-metrics.json | 2 ++ configs/5-1-fetcher-azure.json | 2 ++ configs/5-2-fetcher-azure-logs.json | 2 ++ 14 files changed, 30 insertions(+), 5 deletions(-) diff --git a/configs/1-1-localhost-windows-system.json b/configs/1-1-localhost-windows-system.json index f61b7fef0..4f904283f 100644 --- a/configs/1-1-localhost-windows-system.json +++ b/configs/1-1-localhost-windows-system.json @@ -12,6 +12,8 @@ "description": "Windows Machine", "hint": "Select your localhost OS.", "supportedOs": ["Windows"], + "productTags": [], + "filterTags": [], "datasources": [ { "name": "System", @@ -26,7 +28,7 @@ "receivers": ["filelog","windowseventlog_application","windowseventlog_security","windowseventlog_system"], "processors": ["resourcedetection_system"] }, - "params": + "params": [ { "type": "string-list", diff --git a/configs/1-2-localhost-linux-system.json b/configs/1-2-localhost-linux-system.json index ca1f0c01b..6144c28fb 100644 --- a/configs/1-2-localhost-linux-system.json +++ b/configs/1-2-localhost-linux-system.json @@ -12,6 +12,8 @@ "description": "Linux Machine", "hint": "Select your localhost OS.", "supportedOs": ["Linux"], + "productTags": [], + "filterTags": [], "datasources": [ { "name": "System", diff --git a/configs/1-3-localhost-mac-system.json b/configs/1-3-localhost-mac-system.json index d83083e88..b3b094c38 100644 --- a/configs/1-3-localhost-mac-system.json +++ b/configs/1-3-localhost-mac-system.json @@ -12,6 +12,8 @@ "description": "Mac Machine", "hint": "Select your localhost OS.", "supportedOs": ["Mac"], + "productTags": [], + "filterTags": [], "datasources": [ { "name": "System", diff --git a/configs/2-1-k8s-eks.json b/configs/2-1-k8s-eks.json index 2ec977ef8..c40dfcf86 100644 --- a/configs/2-1-k8s-eks.json +++ b/configs/2-1-k8s-eks.json @@ -13,6 +13,8 @@ "description": "AWS Kubernetes", "hint": "Select your cloud Kubernetes service.", "supportedOs": ["Helm", "Mac", "Windows", "Linux"], + "productTags": [], + "filterTags": [], "capabilities": ["SPM"], "datasources": [ { diff --git a/configs/2-2-k8s-aks.json b/configs/2-2-k8s-aks.json index 0f2dc649e..8a5a57727 100644 --- a/configs/2-2-k8s-aks.json +++ b/configs/2-2-k8s-aks.json @@ -11,6 +11,8 @@ "label": "AKS", "description": "Azure Kubernetes", "supportedOs": ["Helm", "Mac", "Windows", "Linux"], + "productTags": [], + "filterTags": [], "capabilities": ["SPM"], "datasources": [ { diff --git a/configs/2-3-k8s-gke.json b/configs/2-3-k8s-gke.json index fe97c30a2..ecf67fea8 100644 --- a/configs/2-3-k8s-gke.json +++ b/configs/2-3-k8s-gke.json @@ -13,6 +13,8 @@ "description": "GCP Kubernetes", "hint": "Select your cloud Kubernetes service.", "supportedOs": ["Helm", "Mac", "Windows", "Linux"], + "productTags": [], + "filterTags": [], "capabilities": ["SPM"], "datasources": [ { diff --git a/configs/2-4-k8s-digitalocean.json b/configs/2-4-k8s-digitalocean.json index 2c4f3b82b..06ff9d435 100644 --- a/configs/2-4-k8s-digitalocean.json +++ b/configs/2-4-k8s-digitalocean.json @@ -13,6 +13,8 @@ "description": "Managed Kubernetes", "hint": "Select your cloud Kubernetes service.", "supportedOs": ["Helm", "Mac", "Windows", "Linux"], + "productTags": [], + "filterTags": [], "capabilities": ["SPM"], "datasources": [ { diff --git a/configs/3-1-aws-cw.json b/configs/3-1-aws-cw.json index 1a713cee6..50413651c 100644 --- a/configs/3-1-aws-cw.json +++ b/configs/3-1-aws-cw.json @@ -12,6 +12,8 @@ "description": "via Cloudwatch", "hint": "Cloudwatch logs to ship to Logz.io", "supportedOs": ["AWS_Cloudformation"], + "productTags": [], + "filterTags": [], "integrationTemplate": "firehose-logs/0.0.2/sam-template.yaml¶m_logzioType=agent-logzio-firehose¶m_logzioListener=https://aws-firehose-logs-<>", "datasources": [ { @@ -86,7 +88,7 @@ { "label": "RDS", "value": "rds" } ] }, - { + { "type": "string-list", "name": "param_customLogGroups", "label": "Custom Log Groups", @@ -102,4 +104,3 @@ } ] } - \ No newline at end of file diff --git a/configs/3-2-aws-metric-stream.json b/configs/3-2-aws-metric-stream.json index 7dd5c1b23..cdd45d4c9 100644 --- a/configs/3-2-aws-metric-stream.json +++ b/configs/3-2-aws-metric-stream.json @@ -12,6 +12,8 @@ "description": "via Cloudwatch", "hint": "AWS metrics to ship to Logz.io", "supportedOs": ["AWS_Cloudformation"], + "productTags": [], + "filterTags": [], "integrationTemplate": "metric-stream-helpers/aws/1.2.4/sam-template.yaml¶m_logzioDestination=https://listener-aws-metrics-stream-<>.logz.io/¶m_logzioListener=https://<>:8053", "datasources": [ { @@ -210,4 +212,3 @@ } ] } - \ No newline at end of file diff --git a/configs/3-3-aws-ec2-linux-system.json b/configs/3-3-aws-ec2-linux-system.json index f231240bd..c609a9a42 100644 --- a/configs/3-3-aws-ec2-linux-system.json +++ b/configs/3-3-aws-ec2-linux-system.json @@ -12,6 +12,8 @@ "description": "Linux Logs & Metrics", "hint": "EC2 with Linux.", "supportedOs": ["Linux"], + "productTags": [], + "filterTags": [], "datasources": [ { "name": "System", @@ -57,4 +59,3 @@ } ] } - \ No newline at end of file diff --git a/configs/4-1-gcp-logs.json b/configs/4-1-gcp-logs.json index b601e339b..280ef72d4 100644 --- a/configs/4-1-gcp-logs.json +++ b/configs/4-1-gcp-logs.json @@ -11,6 +11,8 @@ "description": "Cloud Logging", "hint": "Logging from GCP services.", "supportedOs": ["GCP"], + "productTags": [], + "filterTags": [], "integrationTemplate": "https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/logzio/logzio-google-pubsub", "datasources": [ { diff --git a/configs/4-2-gcp-metrics.json b/configs/4-2-gcp-metrics.json index 9e4a310e6..c82f8b17f 100644 --- a/configs/4-2-gcp-metrics.json +++ b/configs/4-2-gcp-metrics.json @@ -11,6 +11,8 @@ "description": "Cloud Monitoring", "hint": "Metrics from GCP services.", "supportedOs": ["GCP"], + "productTags": [], + "filterTags": [], "integrationTemplate": "https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/logzio/logzio-google-metrics", "datasources": [ { diff --git a/configs/5-1-fetcher-azure.json b/configs/5-1-fetcher-azure.json index 3f6645440..eab729346 100644 --- a/configs/5-1-fetcher-azure.json +++ b/configs/5-1-fetcher-azure.json @@ -11,6 +11,8 @@ "supportedOs": [ "Fetcher" ], + "productTags": [], + "filterTags": [], "integrationTemplate": "https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/logzio/logzio-google-metrics", "datasources": [ { diff --git a/configs/5-2-fetcher-azure-logs.json b/configs/5-2-fetcher-azure-logs.json index ab8a8fbd3..1f94e2bd0 100644 --- a/configs/5-2-fetcher-azure-logs.json +++ b/configs/5-2-fetcher-azure-logs.json @@ -11,6 +11,8 @@ "supportedOs": [ "Fetcher" ], + "productTags": [], + "filterTags": [], "datasources": [ { "name": "azure-monitor-logs", From 72dad400050ad9c7ca6a33247548c25ed9b4565b Mon Sep 17 00:00:00 2001 From: Adam Cazes Date: Mon, 6 Nov 2023 12:51:53 +0200 Subject: [PATCH 2/5] Update 1-1-localhost-windows-system.json --- configs/1-1-localhost-windows-system.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/1-1-localhost-windows-system.json b/configs/1-1-localhost-windows-system.json index 4f904283f..7476f3ab7 100644 --- a/configs/1-1-localhost-windows-system.json +++ b/configs/1-1-localhost-windows-system.json @@ -12,8 +12,8 @@ "description": "Windows Machine", "hint": "Select your localhost OS.", "supportedOs": ["Windows"], - "productTags": [], - "filterTags": [], + "productTags": ["test"], + "filterTags": ["test"], "datasources": [ { "name": "System", From d0bf9c7f59420b2888e8dbf8f2143c2e459c970a Mon Sep 17 00:00:00 2001 From: Adam Cazes Date: Mon, 6 Nov 2023 13:13:56 +0200 Subject: [PATCH 3/5] added tags for misha --- configs/1-1-localhost-windows-system.json | 4 ++-- configs/1-2-localhost-linux-system.json | 4 ++-- configs/1-3-localhost-mac-system.json | 4 ++-- configs/2-1-k8s-eks.json | 4 ++-- configs/2-2-k8s-aks.json | 4 ++-- configs/2-3-k8s-gke.json | 4 ++-- configs/2-4-k8s-digitalocean.json | 4 ++-- configs/3-1-aws-cw.json | 4 ++-- configs/3-2-aws-metric-stream.json | 4 ++-- configs/3-3-aws-ec2-linux-system.json | 4 ++-- configs/4-1-gcp-logs.json | 4 ++-- configs/4-2-gcp-metrics.json | 4 ++-- configs/5-1-fetcher-azure.json | 4 ++-- configs/5-2-fetcher-azure-logs.json | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/configs/1-1-localhost-windows-system.json b/configs/1-1-localhost-windows-system.json index 7476f3ab7..69e26bdd2 100644 --- a/configs/1-1-localhost-windows-system.json +++ b/configs/1-1-localhost-windows-system.json @@ -12,8 +12,8 @@ "description": "Windows Machine", "hint": "Select your localhost OS.", "supportedOs": ["Windows"], - "productTags": ["test"], - "filterTags": ["test"], + "productTags": ["logs","metrics"], + "filterTags": ["Operating Systems", "Most Popular"], "datasources": [ { "name": "System", diff --git a/configs/1-2-localhost-linux-system.json b/configs/1-2-localhost-linux-system.json index 6144c28fb..f6e767a57 100644 --- a/configs/1-2-localhost-linux-system.json +++ b/configs/1-2-localhost-linux-system.json @@ -12,8 +12,8 @@ "description": "Linux Machine", "hint": "Select your localhost OS.", "supportedOs": ["Linux"], - "productTags": [], - "filterTags": [], + "productTags": ["logs","metrics"], + "filterTags": ["Operating Systems", "Most Popular"], "datasources": [ { "name": "System", diff --git a/configs/1-3-localhost-mac-system.json b/configs/1-3-localhost-mac-system.json index b3b094c38..b757b9c94 100644 --- a/configs/1-3-localhost-mac-system.json +++ b/configs/1-3-localhost-mac-system.json @@ -12,8 +12,8 @@ "description": "Mac Machine", "hint": "Select your localhost OS.", "supportedOs": ["Mac"], - "productTags": [], - "filterTags": [], + "productTags": ["logs","metrics"], + "filterTags": ["Operating Systems", "Most Popular"], "datasources": [ { "name": "System", diff --git a/configs/2-1-k8s-eks.json b/configs/2-1-k8s-eks.json index c40dfcf86..8b45d8c22 100644 --- a/configs/2-1-k8s-eks.json +++ b/configs/2-1-k8s-eks.json @@ -13,8 +13,8 @@ "description": "AWS Kubernetes", "hint": "Select your cloud Kubernetes service.", "supportedOs": ["Helm", "Mac", "Windows", "Linux"], - "productTags": [], - "filterTags": [], + "productTags": ["logs","metrics","traces"], + "filterTags": ["Containers", "Most Popular"], "capabilities": ["SPM"], "datasources": [ { diff --git a/configs/2-2-k8s-aks.json b/configs/2-2-k8s-aks.json index 8a5a57727..ed8005295 100644 --- a/configs/2-2-k8s-aks.json +++ b/configs/2-2-k8s-aks.json @@ -11,8 +11,8 @@ "label": "AKS", "description": "Azure Kubernetes", "supportedOs": ["Helm", "Mac", "Windows", "Linux"], - "productTags": [], - "filterTags": [], + "productTags": ["logs","metrics","traces"], + "filterTags": ["Containers", "Most Popular"], "capabilities": ["SPM"], "datasources": [ { diff --git a/configs/2-3-k8s-gke.json b/configs/2-3-k8s-gke.json index ecf67fea8..17d262175 100644 --- a/configs/2-3-k8s-gke.json +++ b/configs/2-3-k8s-gke.json @@ -13,8 +13,8 @@ "description": "GCP Kubernetes", "hint": "Select your cloud Kubernetes service.", "supportedOs": ["Helm", "Mac", "Windows", "Linux"], - "productTags": [], - "filterTags": [], + "productTags": ["logs","metrics","traces"], + "filterTags": ["Containers", "Most Popular"], "capabilities": ["SPM"], "datasources": [ { diff --git a/configs/2-4-k8s-digitalocean.json b/configs/2-4-k8s-digitalocean.json index 06ff9d435..e4330d03f 100644 --- a/configs/2-4-k8s-digitalocean.json +++ b/configs/2-4-k8s-digitalocean.json @@ -13,8 +13,8 @@ "description": "Managed Kubernetes", "hint": "Select your cloud Kubernetes service.", "supportedOs": ["Helm", "Mac", "Windows", "Linux"], - "productTags": [], - "filterTags": [], + "productTags": ["logs","metrics","traces"], + "filterTags": ["Containers", "Most Popular"], "capabilities": ["SPM"], "datasources": [ { diff --git a/configs/3-1-aws-cw.json b/configs/3-1-aws-cw.json index 50413651c..f23026db2 100644 --- a/configs/3-1-aws-cw.json +++ b/configs/3-1-aws-cw.json @@ -12,8 +12,8 @@ "description": "via Cloudwatch", "hint": "Cloudwatch logs to ship to Logz.io", "supportedOs": ["AWS_Cloudformation"], - "productTags": [], - "filterTags": [], + "productTags": ["logs"], + "filterTags": ["AWS", "Most Popular"], "integrationTemplate": "firehose-logs/0.0.2/sam-template.yaml¶m_logzioType=agent-logzio-firehose¶m_logzioListener=https://aws-firehose-logs-<>", "datasources": [ { diff --git a/configs/3-2-aws-metric-stream.json b/configs/3-2-aws-metric-stream.json index cdd45d4c9..6f6563e44 100644 --- a/configs/3-2-aws-metric-stream.json +++ b/configs/3-2-aws-metric-stream.json @@ -12,8 +12,8 @@ "description": "via Cloudwatch", "hint": "AWS metrics to ship to Logz.io", "supportedOs": ["AWS_Cloudformation"], - "productTags": [], - "filterTags": [], + "productTags": ["metrics"], + "filterTags": ["AWS", "Most Popular"], "integrationTemplate": "metric-stream-helpers/aws/1.2.4/sam-template.yaml¶m_logzioDestination=https://listener-aws-metrics-stream-<>.logz.io/¶m_logzioListener=https://<>:8053", "datasources": [ { diff --git a/configs/3-3-aws-ec2-linux-system.json b/configs/3-3-aws-ec2-linux-system.json index c609a9a42..b1d10197d 100644 --- a/configs/3-3-aws-ec2-linux-system.json +++ b/configs/3-3-aws-ec2-linux-system.json @@ -12,8 +12,8 @@ "description": "Linux Logs & Metrics", "hint": "EC2 with Linux.", "supportedOs": ["Linux"], - "productTags": [], - "filterTags": [], + "productTags": ["logs","metrics"], + "filterTags": ["AWS", "Most Popular"], "datasources": [ { "name": "System", diff --git a/configs/4-1-gcp-logs.json b/configs/4-1-gcp-logs.json index 280ef72d4..6a90d2031 100644 --- a/configs/4-1-gcp-logs.json +++ b/configs/4-1-gcp-logs.json @@ -11,8 +11,8 @@ "description": "Cloud Logging", "hint": "Logging from GCP services.", "supportedOs": ["GCP"], - "productTags": [], - "filterTags": [], + "productTags": ["logs"], + "filterTags": ["GCP"], "integrationTemplate": "https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/logzio/logzio-google-pubsub", "datasources": [ { diff --git a/configs/4-2-gcp-metrics.json b/configs/4-2-gcp-metrics.json index c82f8b17f..e42a644ef 100644 --- a/configs/4-2-gcp-metrics.json +++ b/configs/4-2-gcp-metrics.json @@ -11,8 +11,8 @@ "description": "Cloud Monitoring", "hint": "Metrics from GCP services.", "supportedOs": ["GCP"], - "productTags": [], - "filterTags": [], + "productTags": ["metrics"], + "filterTags": ["GCP"], "integrationTemplate": "https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/logzio/logzio-google-metrics", "datasources": [ { diff --git a/configs/5-1-fetcher-azure.json b/configs/5-1-fetcher-azure.json index eab729346..71c242683 100644 --- a/configs/5-1-fetcher-azure.json +++ b/configs/5-1-fetcher-azure.json @@ -11,8 +11,8 @@ "supportedOs": [ "Fetcher" ], - "productTags": [], - "filterTags": [], + "productTags": ["metrics"], + "filterTags": ["Azure", "Most Popular"], "integrationTemplate": "https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https://github.com/logzio/logzio-google-metrics", "datasources": [ { diff --git a/configs/5-2-fetcher-azure-logs.json b/configs/5-2-fetcher-azure-logs.json index 1f94e2bd0..e5b92238d 100644 --- a/configs/5-2-fetcher-azure-logs.json +++ b/configs/5-2-fetcher-azure-logs.json @@ -11,8 +11,8 @@ "supportedOs": [ "Fetcher" ], - "productTags": [], - "filterTags": [], + "productTags": ["logs"], + "filterTags": ["Azure"], "datasources": [ { "name": "azure-monitor-logs", From 59fa825a1a9c04010b747098729c6e2b8ce5f8b8 Mon Sep 17 00:00:00 2001 From: Mykhailo Semenchenko <45467774+th3M1ke@users.noreply.github.com> Date: Tue, 7 Nov 2023 12:34:44 +0100 Subject: [PATCH 4/5] Update 1-1-localhost-windows-system.json --- configs/1-1-localhost-windows-system.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/1-1-localhost-windows-system.json b/configs/1-1-localhost-windows-system.json index 69e26bdd2..ac616e709 100644 --- a/configs/1-1-localhost-windows-system.json +++ b/configs/1-1-localhost-windows-system.json @@ -12,7 +12,7 @@ "description": "Windows Machine", "hint": "Select your localhost OS.", "supportedOs": ["Windows"], - "productTags": ["logs","metrics"], + "productTags": ["logs", "metrics"], "filterTags": ["Operating Systems", "Most Popular"], "datasources": [ { From bb91cd87fe099e40e4f748c89bd656eca3237728 Mon Sep 17 00:00:00 2001 From: Mykhailo Semenchenko <45467774+th3M1ke@users.noreply.github.com> Date: Tue, 7 Nov 2023 12:48:42 +0100 Subject: [PATCH 5/5] up --- configs/1-2-localhost-linux-system.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/1-2-localhost-linux-system.json b/configs/1-2-localhost-linux-system.json index f6e767a57..c906dd10b 100644 --- a/configs/1-2-localhost-linux-system.json +++ b/configs/1-2-localhost-linux-system.json @@ -12,7 +12,7 @@ "description": "Linux Machine", "hint": "Select your localhost OS.", "supportedOs": ["Linux"], - "productTags": ["logs","metrics"], + "productTags": ["logs", "metrics"], "filterTags": ["Operating Systems", "Most Popular"], "datasources": [ {