Merge branch 'kibana-b' into cusumer-lag-exporter

Author: sionsmith

examples/monitoring/confluent/control-centre.yaml

@@ -5,38 +5,26 @@ metadata:
 spec:
   authorization:
     type: rbac
-  tls:
-    secretRef: tls-group1
   dependencies:
     kafka:
       bootstrapEndpoint: kafka.sandbox.svc.cluster.local:9071
       authentication:
         type: plain
         jaasConfig:
           secretRef: mds-client-connect
-      tls:
-        enabled: true
     mds:
-      endpoint: https://kafka.sandbox.svc.cluster.local:8090
+      endpoint: http://kafka.sandbox.svc.cluster.local:8090
       tokenKeyPair:
         secretRef: mds-public
       authentication:
         type: bearer
         bearer:
           secretRef: mds-client-c3
-      tls:
-        enabled: true
     connect:
       - name: connect
-        url:  https://connect.sandbox.svc.cluster.local:8083
-        tls:
-          enabled: true
+        url:  http://connect.sandbox.svc.cluster.local:8083
     ksqldb:
       - name: ksqldb
-        url:  https://ksqldb.sandbox.svc.cluster.local:8088
-        tls:
-          enabled: true
+        url:  http://ksqldb.sandbox.svc.cluster.local:8088
     schemaRegistry:
-      url: https://schemaregistry.sandbox.svc.cluster.local:8081
-      tls:
-        enabled: true
+      url: http://schemaregistry.sandbox.svc.cluster.local:8081

examples/monitoring/confluent/kafka-connect.yaml

@@ -4,8 +4,6 @@ kind: Connect
 metadata:
   name: connect
 spec:
-  tls:
-    secretRef: tls-group1
   authorization:
     type: rbac
   dependencies:
@@ -15,10 +13,8 @@ spec:
         type: plain
         jaasConfig:
           secretRef: mds-client-connect
-      tls:
-        enabled: true
     mds:
-      endpoint: https://kafka.sandbox.svc.cluster.local:8090
+      endpoint: http://kafka.sandbox.svc.cluster.local:8090
       tokenKeyPair:
         secretRef: mds-public
       authentication:

examples/monitoring/confluent/kafka.yaml

@@ -6,43 +6,33 @@ metadata:
 spec:
   configOverrides:
     server:
-      - confluent.schema.registry.url=https://schemaregistry.sandbox.svc.cluster.local:8081
+      - confluent.schema.registry.url=http://schemaregistry.sandbox.svc.cluster.local:8081
       - listener.name.internal.plain.sasl.server.callback.handler.class=io.confluent.security.auth.provider.ldap.LdapAuthenticateCallbackHandler
       - listener.name.external.plain.sasl.server.callback.handler.class=io.confluent.security.auth.provider.ldap.LdapAuthenticateCallbackHandler
       - listener.name.replication.plain.sasl.server.callback.handler.class=io.confluent.security.auth.provider.ldap.LdapAuthenticateCallbackHandler
-  tls:
-    secretRef: tls-group1
   metricReporter:
     enabled: true
     authentication:
       type: plain
       jaasConfigPassThrough:
         secretRef: broker-credential
-    tls:
-      enabled: true
   listeners:
     internal:
       authentication:
         type: plain
         jaasConfigPassThrough:
           secretRef: broker-credential
-      tls:
-        enabled: true
     external:
       authentication:
         type: plain
         jaasConfigPassThrough:
           secretRef: broker-credential
-      tls:
-        enabled: true
   authorization:
     type: rbac
     superUsers:
       - User:kafka
   services:
     mds:
-      tls:
-        enabled: true
       tokenKeyPair:
         secretRef: broker-credential
       provider:
@@ -53,8 +43,6 @@ spec:
             type: simple
             simple:
               secretRef: broker-credential
-          tls:
-            enabled: true
           configurations:
             groupNameAttribute: cn
             groupObjectClass: groupOfNames
@@ -72,10 +60,9 @@ spec:
         bearer:
           secretRef: broker-credential
     zookeeper:
-      endpoint: zookeeper.sandbox.svc.cluster.local:2182
+      endpoint: zookeeper.sandbox.svc.cluster.local:2181
       authentication:
         type: digest
         jaasConfig:
           secretRef: broker-credential
-      tls:
-        enabled: true
+

examples/monitoring/confluent/ksqldb.yaml

@@ -6,24 +6,18 @@ metadata:
 spec:
   authorization:
     type: rbac
-  tls:
-    secretRef: tls-group1
   dependencies:
     kafka:
       bootstrapEndpoint: kafka.sandbox.svc.cluster.local:9071
       authentication:
         type: plain
         jaasConfig:
           secretRef: mds-client-connect
-      tls:
-        enabled: true
     mds:
-      endpoint: https://kafka.sandbox.svc.cluster.local:8090
+      endpoint: http://kafka.sandbox.svc.cluster.local:8090
       tokenKeyPair:
         secretRef: mds-public
       authentication:
         type: bearer
         bearer:
           secretRef: mds-client-ksqldb
-      tls:
-        enabled: true

examples/monitoring/confluent/schema-registry.yaml

@@ -5,24 +5,18 @@ metadata:
 spec:
   authorization:
     type: rbac
-  tls:
-    secretRef: tls-group1
   dependencies:
     kafka:
       bootstrapEndpoint: kafka.sandbox.svc.cluster.local:9071
       authentication:
         type: plain
         jaasConfig:
           secretRef: mds-client-sr
-      tls:
-        enabled: true
     mds:
-      endpoint: https://kafka.sandbox.svc.cluster.local:8090
+      endpoint: http://kafka.sandbox.svc.cluster.local:8090
       tokenKeyPair:
         secretRef: mds-public
       authentication:
         type: bearer
         bearer:
           secretRef: mds-client-sr
-      tls:
-        enabled: true

examples/monitoring/confluent/zookeeper.yaml

@@ -7,5 +7,3 @@ spec:
     type: digest
     jaasConfig:
       secretRef: zk-credential
-  tls:
-    secretRef: tls-group1

examples/monitoring/producer/kafka-client-config.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  kafka.properties: Ym9vdHN0cmFwLnNlcnZlcnM9a2Fma2Euc2FuZGJveC5zdmMuY2x1c3Rlci5sb2NhbDo5MDcxCnNhc2wuamFhcy5jb25maWc9b3JnLmFwYWNoZS5rYWZrYS5jb21tb24uc2VjdXJpdHkucGxhaW4uUGxhaW5Mb2dpbk1vZHVsZSByZXF1aXJlZCB1c2VybmFtZT1rYWZrYSBwYXNzd29yZD1rYWZrYS1zZWNyZXQ7CnNhc2wubWVjaGFuaXNtPVBMQUlOCnNlY3VyaXR5LnByb3RvY29sPVNBU0xfU1NMCnNzbC50cnVzdHN0b3JlLmxvY2F0aW9uPS9tbnQvc3NsY2VydHMvdHJ1c3RzdG9yZS5wMTIKc3NsLnRydXN0c3RvcmUucGFzc3dvcmQ9bXlzdG9yZXBhc3N3b3Jk
+  kafka.properties: Ym9vdHN0cmFwLnNlcnZlcnM9a2Fma2Euc2FuZGJveC5zdmMuY2x1c3Rlci5sb2NhbDo5MDcxCnNhc2wuamFhcy5jb25maWc9b3JnLmFwYWNoZS5rYWZrYS5jb21tb24uc2VjdXJpdHkucGxhaW4uUGxhaW5Mb2dpbk1vZHVsZSByZXF1aXJlZCB1c2VybmFtZT1rYWZrYSBwYXNzd29yZD1rYWZrYS1zZWNyZXQ7CnNhc2wubWVjaGFuaXNtPVNBU0xfUExBSU5URVhUCnNlY3VyaXR5LnByb3RvY29sPVNBU0xfUExBSU5URVhUCg==
 kind: Secret
 metadata:
   creationTimestamp: null

examples/monitoring/producer/kafka.properties

@@ -1,6 +1,4 @@
 bootstrap.servers=kafka.sandbox.svc.cluster.local:9071
 sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required username=kafka password=kafka-secret;
-sasl.mechanism=PLAIN
-security.protocol=SASL_SSL
-ssl.truststore.location=/mnt/sslcerts/truststore.p12
-ssl.truststore.password=mystorepassword
+sasl.mechanism=SASL_PLAINTEXT
+security.protocol=SASL_PLAINTEXT

examples/monitoring/producer/source-topic.yaml

@@ -14,7 +14,7 @@ spec:
       type: bearer
       bearer:
         secretRef: mds-client-c3
-    endpoint: https://kafka.sandbox.svc.cluster.local:8090
+    endpoint: http://kafka.sandbox.svc.cluster.local:8090
   configs:
     cleanup.policy: "delete"
 ---
@@ -33,7 +33,7 @@ spec:
       type: bearer
       bearer:
         secretRef: mds-client-c3
-    endpoint: https://kafka.sandbox.svc.cluster.local:8090
+    endpoint: http://kafka.sandbox.svc.cluster.local:8090
   configs:
     cleanup.policy: "delete"
 ---
@@ -52,7 +52,7 @@ spec:
       type: bearer
       bearer:
         secretRef: mds-client-c3
-    endpoint: https://kafka.sandbox.svc.cluster.local:8090
+    endpoint: http://kafka.sandbox.svc.cluster.local:8090
   configs:
     cleanup.policy: "delete"
 ---
@@ -71,7 +71,7 @@ spec:
       type: bearer
       bearer:
         secretRef: mds-client-c3
-    endpoint: https://kafka.sandbox.svc.cluster.local:8090
+    endpoint: http://kafka.sandbox.svc.cluster.local:8090
   configs:
     cleanup.policy: "delete"
 ---
@@ -90,7 +90,7 @@ spec:
       type: bearer
       bearer:
         secretRef: mds-client-c3
-    endpoint: https://kafka.sandbox.svc.cluster.local:8090
+    endpoint: http://kafka.sandbox.svc.cluster.local:8090
   configs:
     cleanup.policy: "delete"
 ---
@@ -109,7 +109,7 @@ spec:
       type: bearer
       bearer:
         secretRef: mds-client-c3
-    endpoint: https://kafka.sandbox.svc.cluster.local:8090
+    endpoint: http://kafka.sandbox.svc.cluster.local:8090
   configs:
     cleanup.policy: "delete"
 ---
@@ -128,7 +128,7 @@ spec:
       type: bearer
       bearer:
         secretRef: mds-client-c3
-    endpoint: https://kafka.sandbox.svc.cluster.local:8090
+    endpoint: http://kafka.sandbox.svc.cluster.local:8090
   configs:
     cleanup.policy: "delete"
 ---
@@ -147,6 +147,6 @@ spec:
       type: bearer
       bearer:
         secretRef: mds-client-c3
-    endpoint: https://kafka.sandbox.svc.cluster.local:8090
+    endpoint: http://kafka.sandbox.svc.cluster.local:8090
   configs:
     cleanup.policy: "delete"

examples/monitoring/prometheus/kafka-exporter/deployment.yaml

@@ -27,13 +27,11 @@ spec:
       containers:
         - args:
             - '--log.level=info'
-            - '--kafka.server=kafka:9092'
+            - '--kafka.server=kafka:9071'
             - '--sasl.enabled'
             - '--sasl.username=kafka'
             - '--sasl.password=kafka-secret'
             - '--sasl.mechanism=plain'
-            - '--tls.enabled'
-            - '--tls.insecure-skip-tls-verify'
           env:
             []
           name: prometheus-kafka-exporter