Version 1.1.2

guilhemmarchand · Jan 27, 2019 · 8c4339a · 8c4339a
1 parent 5ea478a
commit 8c4339a
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 39 deletions.
diff --git a/DA-ITSI-TELEGRAF-KAFKA/default/app.conf b/DA-ITSI-TELEGRAF-KAFKA/default/app.conf
@@ -3,7 +3,7 @@ is_configured = 0
 
 [launcher]
 author = Guilhem Marchand
-version = 1.1.1
+version = 1.1.2
 description = The Apache Kafka module for ITSI provides the best end to end monitoring for Kafka deployments leveraging Influxdata Telegraf
 
 [ui]

diff --git a/DA-ITSI-TELEGRAF-KAFKA/default/inputs.conf b/DA-ITSI-TELEGRAF-KAFKA/default/inputs.conf
@@ -16,8 +16,8 @@
 #                               |_|
 
 [itsi_csv_import://DA-ITSI-TELEGRAF-KAFKA-entity_import_zookeeper]
-entity_identifier_fields = server
-entity_informational_fields = itsi_role,env,label
+entity_identifier_fields = server,env,label
+entity_informational_fields = itsi_role
 entity_title_field = server
 import_from_search = 1
 index_earliest = -4h
@@ -35,8 +35,8 @@ interval = 0 0,4,8,12,16,20 * * *
 #
 
 [itsi_csv_import://DA-ITSI-TELEGRAF-KAFKA-entity_import_kafka_brokers]
-entity_identifier_fields = kafka_broker
-entity_informational_fields = itsi_role,env,label
+entity_identifier_fields = kafka_broker,env,label
+entity_informational_fields = itsi_role
 entity_title_field = kafka_broker
 import_from_search = 1
 index_earliest = -4h
@@ -54,8 +54,8 @@ interval = 1 0,4,8,12,16,20 * * *
 #
 
 [itsi_csv_import://DA-ITSI-TELEGRAF-KAFKA-entity_import_kafka_connect]
-entity_identifier_fields = kafka_connect
-entity_informational_fields = itsi_role,env,label
+entity_identifier_fields = kafka_connect,env,label
+entity_informational_fields = itsi_role
 entity_title_field = kafka_connect
 import_from_search = 1
 index_earliest = -4h
@@ -86,8 +86,8 @@ interval = 2 0,4,8,12,16,20 * * *
 #
 
 [itsi_csv_import://DA-ITSI-TELEGRAF-KAFKA-entity_import_kafka_tasks]
-entity_identifier_fields = kafka_task
-entity_informational_fields = itsi_role,env,label
+entity_identifier_fields = kafka_task,env,label
+entity_informational_fields = itsi_role
 entity_title_field = kafka_task
 import_from_search = 1
 index_earliest = -4h
@@ -105,8 +105,8 @@ interval = 3 0,4,8,12,16,20 * * *
 #                                    |_|
 
 [itsi_csv_import://DA-ITSI-TELEGRAF-KAFKA-entity_import_kafka_topics]
-entity_identifier_fields = kafka_topic
-entity_informational_fields = itsi_role,env,label
+entity_identifier_fields = kafka_topic,env,label
+entity_informational_fields = itsi_role
 entity_title_field = kafka_topic
 import_from_search = 1
 index_earliest = -4h
@@ -130,8 +130,8 @@ interval = 4 0,4,8,12,16,20 * * *
 #                                                                                  |___/                |___/
 
 [itsi_csv_import://DA-ITSI-TELEGRAF-KAFKA-entity_import_kafka_schema-registry]
-entity_identifier_fields = kafka_schema_registry
-entity_informational_fields = itsi_role,env,label
+entity_identifier_fields = kafka_schema_registry,env,label
+entity_informational_fields = itsi_role
 entity_title_field = kafka_schema_registry
 import_from_search = 1
 index_earliest = -4h
@@ -155,8 +155,8 @@ interval = 5 0,4,8,12,16,20 * * *
 #                                        |_|
 
 [itsi_csv_import://DA-ITSI-TELEGRAF-KAFKA-entity_import_kafka_ksql-server]
-entity_identifier_fields = kafka_ksql_server
-entity_informational_fields = itsi_role,env,label
+entity_identifier_fields = kafka_ksql_server,env,label
+entity_informational_fields = itsi_role
 entity_title_field = kafka_ksql_server
 import_from_search = 1
 index_earliest = -4h
@@ -180,8 +180,8 @@ interval = 6 0,4,8,12,16,20 * * *
 #
 
 [itsi_csv_import://DA-ITSI-TELEGRAF-KAFKA-entity_import_kafka_kafka-rest]
-entity_identifier_fields = kafka_rest
-entity_informational_fields = itsi_role,env,label
+entity_identifier_fields = kafka_rest,env,label
+entity_informational_fields = itsi_role
 entity_title_field = kafka_rest
 import_from_search = 1
 index_earliest = -4h
@@ -205,8 +205,8 @@ interval = 7 0,4,8,12,16,20 * * *
 #
 
 [itsi_csv_import://DA-ITSI-TELEGRAF-KAFKA-entity_import_kafka_linkedin_kafka_monitors]
-entity_identifier_fields = kafka_monitor
-entity_informational_fields = itsi_role,env,label
+entity_identifier_fields = kafka_monitor,env,label
+entity_informational_fields = itsi_role
 entity_title_field = kafka_monitor
 import_from_search = 1
 index_earliest = -4h

diff --git a/DA-ITSI-TELEGRAF-KAFKA/default/itsi_service_template.conf b/DA-ITSI-TELEGRAF-KAFKA/default/itsi_service_template.conf
@@ -12,13 +12,13 @@ entity_rules = [\
             }, \
             {\
                 "field": "env", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
             {\
                 "field": "label", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
@@ -48,13 +48,13 @@ entity_rules = [\
             }, \
             {\
                 "field": "env", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
             {\
                 "field": "label", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
@@ -84,15 +84,21 @@ entity_rules = [\
             }, \
             {\
                 "field": "env", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
             {\
                 "field": "label", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
+            }, \
+            {\
+                "field": "itsi_role", \
+                "field_type": "info", \
+                "rule_type": "matches", \
+                "value": "kafka_topic"\
             }\
         ]\
     }\
@@ -114,13 +120,13 @@ entity_rules = [\
             }, \
             {\
                 "field": "env", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
             {\
                 "field": "label", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
@@ -150,13 +156,13 @@ entity_rules = [\
             }, \
             {\
                 "field": "env", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
             {\
                 "field": "label", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
@@ -186,13 +192,13 @@ entity_rules = [\
             }, \
             {\
                 "field": "env", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
             {\
                 "field": "label", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
@@ -222,13 +228,13 @@ entity_rules = [\
             }, \
             {\
                 "field": "env", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
             {\
                 "field": "label", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
@@ -258,13 +264,13 @@ entity_rules = [\
             }, \
             {\
                 "field": "env", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
             {\
                 "field": "label", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
@@ -294,13 +300,13 @@ entity_rules = [\
             }, \
             {\
                 "field": "env", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
             {\
                 "field": "label", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
@@ -330,13 +336,13 @@ entity_rules = [\
             }, \
             {\
                 "field": "env", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \
             {\
                 "field": "label", \
-                "field_type": "info", \
+                "field_type": "alias", \
                 "rule_type": "matches", \
                 "value": "*"\
             }, \

diff --git a/DA-ITSI-TELEGRAF-KAFKA_111.tgz b/DA-ITSI-TELEGRAF-KAFKA_111.tgz
diff --git a/DA-ITSI-TELEGRAF-KAFKA_112.tgz b/DA-ITSI-TELEGRAF-KAFKA_112.tgz
diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
@@ -1,6 +1,23 @@
 Release notes
 #############
 
+Version 1.1.2
+=============
+
+**CAUTION: Breaking changes and major release, telegraf modification is required to provide global tags for env and label dimensions!**
+
+https://da-itsi-telegraf-kafka.readthedocs.io/en/latest/kafka_monitoring.html#telegraf-installation-and-configuration
+
+**Upgrade path:**
+
+- Upgrade telegraf configuration to provide the env and label tags
+- Upgrade the module, manage entities and rebuild your services
+
+**release notes:**
+
+- fix: migrated env/label tags from info fields to alias fields to allow proper KPI filtering
+- fix: missing itsi_role info fields in Kafka topics service template
+
 Version 1.1.1
 =============