Move jolokia metricsets to their own input

jsoriano · May 11, 2020 · 957e299 · 957e299
1 parent 22af451
commit 957e299
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 33 deletions.
diff --git a/dev/packages/alpha/kafka/0.0.2/dataset/broker/agent/stream/stream.yml.hbs b/dev/packages/alpha/kafka/0.0.2/dataset/broker/agent/stream/stream.yml.hbs
@@ -1,6 +1,6 @@
 metricsets: ["broker"]
 period: {{period}}
 hosts:
-{{#each jolokia_hosts}}
+{{#each hosts}}
   - {{this}}
 {{/each}}
diff --git a/dev/packages/alpha/kafka/0.0.2/dataset/broker/manifest.yml b/dev/packages/alpha/kafka/0.0.2/dataset/broker/manifest.yml
@@ -2,6 +2,6 @@ title: Kafka broker metrics
 release: experimental
 type: metrics
 streams:
-- input: kafka/metrics
+- input: kafka_jolokia/metrics
   title: Kafka broker metrics
   description: Collect Kafka broker metrics
diff --git a/dev/packages/alpha/kafka/0.0.2/dataset/consumer/agent/stream/stream.yml.hbs b/dev/packages/alpha/kafka/0.0.2/dataset/consumer/agent/stream/stream.yml.hbs
@@ -1,6 +1,6 @@
 metricsets: ["consumer"]
 period: {{period}}
 hosts:
-{{#each jolokia_hosts}}
+{{#each hosts}}
   - {{this}}
 {{/each}}
diff --git a/dev/packages/alpha/kafka/0.0.2/dataset/consumer/manifest.yml b/dev/packages/alpha/kafka/0.0.2/dataset/consumer/manifest.yml
@@ -2,6 +2,6 @@ title: Kafka consumer metrics
 release: experimental
 type: metrics
 streams:
-- input: kafka/metrics
+- input: kafka_jolokia/metrics
   title: Kafka consumer metrics
   description: Collect Kafka consumer metrics
diff --git a/dev/packages/alpha/kafka/0.0.2/dataset/consumergroup/manifest.yml b/dev/packages/alpha/kafka/0.0.2/dataset/consumergroup/manifest.yml
@@ -5,15 +5,3 @@ streams:
 - input: kafka/metrics
   title: Kafka consumergroup metrics
   description: Collect Kafka consumergroup metrics
-  vars:
-    - name: topics
-      type: text
-      title: List of topics to query metrics for
-      multi: true
-      show_user: true
-    - name: username
-      type: text
-      title: SASL username
-    - name: password
-      type: password
-      title: SASL password
diff --git a/dev/packages/alpha/kafka/0.0.2/dataset/partition/manifest.yml b/dev/packages/alpha/kafka/0.0.2/dataset/partition/manifest.yml
@@ -5,15 +5,3 @@ streams:
 - input: kafka/metrics
   title: Kafka partition metrics
   description: Collect Kafka partition metrics
-  vars:
-    - name: topics
-      type: text
-      title: List of topics to query metrics for
-      multi: true
-      show_user: true
-    - name: username
-      type: text
-      title: SASL username
-    - name: password
-      type: password
-      title: SASL password
diff --git a/dev/packages/alpha/kafka/0.0.2/dataset/producer/agent/stream/stream.yml.hbs b/dev/packages/alpha/kafka/0.0.2/dataset/producer/agent/stream/stream.yml.hbs
@@ -1,6 +1,6 @@
 metricsets: ["producer"]
 period: {{period}}
 hosts:
-{{#each jolokia_hosts}}
+{{#each hosts}}
   - {{this}}
 {{/each}}
diff --git a/dev/packages/alpha/kafka/0.0.2/dataset/producer/manifest.yml b/dev/packages/alpha/kafka/0.0.2/dataset/producer/manifest.yml
@@ -2,6 +2,6 @@ title: Kafka producer metrics
 release: experimental
 type: metrics
 streams:
-- input: kafka/metrics
+- input: kafka_jolokia/metrics
   title: Kafka producer metrics
   description: Collect Kafka producer metrics
diff --git a/dev/packages/alpha/kafka/0.0.2/manifest.yml b/dev/packages/alpha/kafka/0.0.2/manifest.yml
@@ -50,11 +50,44 @@ datasources:
         show_user: true
         default:
           - 'localhost:9092'
-      - name: jolokia_hosts
+      - name: period
+        type: text
+        title: Period
+        required: true
+        show_user: true
+        default: 10s
+      - name: topics
+        type: text
+        title: List of topics to query metrics for
+        multi: true
+        show_user: true
+      - name: username
         type: text
-        title: Address of Jolokia agents installed in Kafka (required for some metricsets)
+        title: SASL username
+      - name: password
+        type: password
+        title: SASL password
+      # TODO: Template for common SSL options?
+      - name: ssl.certificate_authorities
+        type: text  # TODO: Add a "path" type so it helps in UI?
         multi: true
-        required: false
+        show_user: true
+      - name: ssl.certificate
+        type: text  # TODO: Add a "path" type so it helps in UI?
+        show_user: true
+      - name: ssl.key
+        type: text  # TODO: Add a "path" type so it helps in UI?
+        show_user: true
+  - type: kafka_jolokia/metrics
+    title: Collect Jolokia metrics from Kafka instances
+    description: Collecting Kafka broker, consumer, consumergroup, partition and producer
+      metrics
+    vars:
+      - name: hosts
+        type: text
+        title: Address of Jolokia agents installed in Kafka
+        multi: true
+        required: true
         show_user: true
         default:
           - 'localhost:8778'
@@ -64,6 +97,12 @@ datasources:
         required: true
         show_user: true
         default: 10s
+      - name: username
+        type: text
+        title: Basic authentication username
+      - name: password
+        type: password
+        title: Basic authentication password
       # TODO: Template for common SSL options?
       - name: ssl.certificate_authorities
         type: text  # TODO: Add a "path" type so it helps in UI?