Update dependencies and Prometheus annotations. #77

sitewhere · Jul 3, 2019 · bccbd70 · bccbd70
1 parent 7d8bd7c
commit bccbd70
Show file tree

Hide file tree

Showing 22 changed files with 134 additions and 4 deletions.
diff --git a/charts/sitewhere/requirements.lock b/charts/sitewhere/requirements.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: sitewhere-infra-core
   repository: https://sitewhere.io/helm-charts
-  version: 0.2.2
+  version: 0.2.3
 - name: sitewhere-infra-database
   repository: https://sitewhere.io/helm-charts
   version: 0.2.0
-digest: sha256:457ce7e95f16b9d304d614cb9254eddb8724a8437ee10a4758968e197ae3de9b
-generated: 2019-06-11T17:48:12.2689312-04:00
+digest: sha256:7124d4fdee1c77ac54d271d5e42699275b25c8be5aa76bca810b2a79e4f0f2a8
+generated: 2019-07-03T20:13:43.817664-03:00
diff --git a/charts/sitewhere/requirements.yaml b/charts/sitewhere/requirements.yaml
@@ -1,6 +1,6 @@
 dependencies:
 - name: sitewhere-infra-core
-  version: 0.2.2
+  version: 0.2.3
   repository: https://sitewhere.io/helm-charts
   condition: sitewhere-infra-core.enabled
 - name: sitewhere-infra-database

diff --git a/charts/sitewhere/templates/Asset-Management.yaml b/charts/sitewhere/templates/Asset-Management.yaml
@@ -24,6 +24,8 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "asset-management"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-asset-management
@@ -32,6 +34,7 @@ spec:
           ports:
             - containerPort: 9000
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8006
             - containerPort: 1106
@@ -62,6 +65,10 @@ spec:
       targetPort: {{ .Values.services.asset_management.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-asset-management
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Batch-Operations.yaml b/charts/sitewhere/templates/Batch-Operations.yaml
@@ -24,6 +24,8 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "batch-operations"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-batch-operations
@@ -32,6 +34,7 @@ spec:
           ports:
             - containerPort: 9000
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8011
             - containerPort: 1111
@@ -62,6 +65,10 @@ spec:
       targetPort: {{ .Values.services.batch_operations.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-batch-operations
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Command-Delivery.yaml b/charts/sitewhere/templates/Command-Delivery.yaml
@@ -24,13 +24,16 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "command-delivery"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-command-delivery
 {{- include "sitewhere.microservice.image" $data | indent 10 }}
           imagePullPolicy: {{ .Values.services.image.pullPolicy }}
           ports:
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8012
             - containerPort: 1112
@@ -56,6 +59,10 @@ spec:
       targetPort: {{ .Values.services.command_delivery.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-command-delivery
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Device-Management.yaml b/charts/sitewhere/templates/Device-Management.yaml
@@ -24,6 +24,8 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "device-management"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-device-management
@@ -32,6 +34,7 @@ spec:
           ports:
             - containerPort: 9000
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8004
             - containerPort: 1104
@@ -62,6 +65,10 @@ spec:
       targetPort: {{ .Values.services.device_management.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-device-management
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Device-Registration.yaml b/charts/sitewhere/templates/Device-Registration.yaml
@@ -24,13 +24,16 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "device-registration"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-device-registration
 {{- include "sitewhere.microservice.image" $data | indent 10 }}
           imagePullPolicy: {{ .Values.services.image.pullPolicy }}
           ports:
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8013
             - containerPort: 1113
@@ -56,6 +59,10 @@ spec:
       targetPort: {{ .Values.services.device_registration.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-device-registration
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Device-State.yaml b/charts/sitewhere/templates/Device-State.yaml
@@ -24,6 +24,8 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "device-state"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-device-state
@@ -32,6 +34,7 @@ spec:
           ports:
             - containerPort: 9000
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8014
             - containerPort: 1114
@@ -61,6 +64,10 @@ spec:
       targetPort: {{ .Values.services.device_state.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-device-state
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Event-Management.yaml b/charts/sitewhere/templates/Event-Management.yaml
@@ -24,6 +24,8 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "event-management"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-event-management
@@ -32,6 +34,7 @@ spec:
           ports:
             - containerPort: 9000
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8005
             - containerPort: 1105
@@ -62,6 +65,10 @@ spec:
       targetPort: {{ .Values.services.event_management.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-event-management
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Event-Search.yaml b/charts/sitewhere/templates/Event-Search.yaml
@@ -24,6 +24,8 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "event-search"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-event-search
@@ -32,6 +34,7 @@ spec:
           ports:
             - containerPort: 9000
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8015
             - containerPort: 1115
@@ -61,6 +64,10 @@ spec:
       targetPort: {{ .Values.services.event_search.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-event-search
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Event-Sources.yaml b/charts/sitewhere/templates/Event-Sources.yaml
@@ -24,13 +24,16 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "event-sources"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-event-sources
 {{- include "sitewhere.microservice.image" $data | indent 10 }}
           imagePullPolicy: {{ .Values.services.image.pullPolicy }}
           ports:
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8007
             - containerPort: 1107
@@ -56,6 +59,10 @@ spec:
       targetPort: {{ .Values.services.event_sources.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-event-sources
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Inbound-Processing.yaml b/charts/sitewhere/templates/Inbound-Processing.yaml
@@ -24,13 +24,16 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "inbound-processing"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-inbound-processing
 {{- include "sitewhere.microservice.image" $data | indent 10 }}
           imagePullPolicy: {{ .Values.services.image.pullPolicy }}
           ports:
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8008
             - containerPort: 1108
@@ -56,6 +59,10 @@ spec:
       targetPort: {{ .Values.services.inbound_processing.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-inbound-processing
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Instance-Management.yaml b/charts/sitewhere/templates/Instance-Management.yaml
@@ -24,6 +24,8 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "instance-management"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-instance-management
@@ -33,6 +35,7 @@ spec:
             - containerPort: 9001
             - containerPort: 9004
             - containerPort: 9005
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8001
             - containerPort: 1101
@@ -70,6 +73,10 @@ spec:
       targetPort: {{ .Values.services.instance_management.service.grpc.tenant_management.port }}
       protocol: TCP
       name: grpc-tenant-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-instance-management
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Label-Generation.yaml b/charts/sitewhere/templates/Label-Generation.yaml
@@ -24,6 +24,8 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "label-generation"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-label-generation
@@ -32,6 +34,7 @@ spec:
           ports:
             - containerPort: 9000
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8009
             - containerPort: 1109
@@ -61,6 +64,10 @@ spec:
       targetPort: {{ .Values.services.label_generation.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-label-generation
     app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/sitewhere/templates/Outbound-Connectors.yaml b/charts/sitewhere/templates/Outbound-Connectors.yaml
@@ -24,13 +24,16 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         sitewhere.io/role: "microservice"
         sitewhere.io/name: "outbound-connectors"
+      annotations:
+{{include "sitewhere.microservice.prometheus" . | indent 8 }}
     spec:
       containers:
         - name: {{ .Chart.Name }}-outbound-connectors
 {{- include "sitewhere.microservice.image" $data | indent 10 }}
           imagePullPolicy: {{ .Values.services.image.pullPolicy }}
           ports:
             - containerPort: 9001
+            - containerPort: {{ .Values.services.metrics.port }}
 {{- if .Values.services.debug }}
             - containerPort: 8016
             - containerPort: 1116
@@ -56,6 +59,10 @@ spec:
       targetPort: {{ .Values.services.outbound_connectors.service.grpc.management.port }}
       protocol: TCP
       name: grpc-management
+    - port: {{ .Values.services.metrics.port }}
+      targetPort: {{ .Values.services.metrics.port }}
+      protocol: HTTP
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "sitewhere.name" . }}-outbound-connectors
     app.kubernetes.io/instance: {{ .Release.Name }}