INFRA-37110: Add app.mintel.com/application to `podTargetLabels

charts/standard-application-stack/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v7.5.0] - 2024-09-09
+### Added
+- Add `app.mintel.com/application` to `podTargetLabels` (ensures label is added to ingested metric)
+
 ## [v7.4.0] - 2024-08-27
 ### Added
 - Set the `Application` ALB annotation tag on the Service resource. This propagates to the AWS TargetGroup as a tag.

charts/standard-application-stack/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 7.4.0
+version: 7.5.0
 
 dependencies:
   - name: redis

charts/standard-application-stack/README.md

@@ -1,6 +1,6 @@
 # standard-application-stack
 
-![Version: 7.4.0](https://img.shields.io/badge/Version-7.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 7.5.0](https://img.shields.io/badge/Version-7.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A generic chart to support most common application requirements
 

charts/standard-application-stack/templates/_helpers.tpl

@@ -114,6 +114,7 @@ app.kubernetes.io/component: app
 - app.kubernetes.io/part-of
 - app.kubernetes.io/component
 - app.kubernetes.io/instance
+- app.mintel.com/application
 - app.mintel.com/owner
 {{- end -}}
 

charts/standard-application-stack/tests/__snapshot__/pod_monitor_test.yaml.snap

@@ -37,6 +37,7 @@ Check additional PodMonitor resources:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -80,6 +81,7 @@ Check additional PodMonitor resources:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -123,6 +125,7 @@ Check additional PodMonitor resources:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -174,6 +177,7 @@ Check basic-auth:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -335,6 +339,7 @@ Check combined template defaults:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -500,6 +505,7 @@ Check combined template with extra ports and monitors:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -543,6 +549,7 @@ Check combined template with extra ports and monitors:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -586,6 +593,7 @@ Check combined template with extra ports and monitors:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -630,6 +638,7 @@ Check default endpoints:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -674,6 +683,7 @@ Check default targetLabels:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -718,6 +728,7 @@ Check metric overrides:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -762,6 +773,7 @@ Check name, namespace and labels:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:

charts/standard-application-stack/tests/__snapshot__/service_monitor_test.yaml.snap

@@ -65,6 +65,7 @@ Check additional ServiceMonitor resources:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -114,6 +115,7 @@ Check additional ServiceMonitor resources:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -163,6 +165,7 @@ Check additional ServiceMonitor resources:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -220,6 +223,7 @@ Check basic-auth:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -387,6 +391,7 @@ Check combined template defaults:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -584,6 +589,7 @@ Check combined template with extra ports and monitors:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -633,6 +639,7 @@ Check combined template with extra ports and monitors:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -682,6 +689,7 @@ Check combined template with extra ports and monitors:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -764,6 +772,7 @@ Check default endpoints:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -814,6 +823,7 @@ Check default targetLabels:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -864,6 +874,7 @@ Check metric overrides:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:
@@ -914,6 +925,7 @@ Check name, namespace and labels:
         - app.kubernetes.io/part-of
         - app.kubernetes.io/component
         - app.kubernetes.io/instance
+        - app.mintel.com/application
         - app.mintel.com/owner
       selector:
         matchLabels:

charts/standard-application-stack/tests/pod_monitor_test.yaml

@@ -46,6 +46,7 @@ tests:
             - app.kubernetes.io/part-of
             - app.kubernetes.io/component
             - app.kubernetes.io/instance
+            - app.mintel.com/application
             - app.mintel.com/owner
   - it: Check default endpoints
     template: pod-monitor.yaml

charts/standard-application-stack/tests/service_monitor_test.yaml

@@ -54,6 +54,7 @@ tests:
             - app.kubernetes.io/part-of
             - app.kubernetes.io/component
             - app.kubernetes.io/instance
+            - app.mintel.com/application
             - app.mintel.com/owner
   - it: Check default endpoints
     template: service-monitor.yaml