Merge pull request #7 from ndustrialio/datadoge

update common to include datadog logging annotations

README.md

@@ -30,6 +30,10 @@ ndustrial:
   organization:
   ## @param ndustrial.owner The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required)
   owner:
+  ## @param ndustrial.env The environment being deployed into Should most likely be one of: dev, staging, prod, or qa. (Required)
+  env:
+  ## @param ndustrial.version The app version being deployed
+  version:
 ```
 
 If it is a `contxt` deployed chart the following values need to be defined:

ndustrial/common/Chart.yaml

@@ -19,5 +19,5 @@ sources:
   - https://ndustrial.io/
 type: library
 # Please make sure that version and appVersion are always the same.
-version: 0.1.3
-appVersion: 0.1.3
+version: 0.1.4
+appVersion: 0.1.4

ndustrial/common/templates/_labels.tpl

@@ -10,6 +10,11 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 ndustrial.io/app: {{ .Values.ndustrial.name }}
 ndustrial.io/organization.slug: {{ .Values.ndustrial.organization }}
 ndustrial.io/owner: {{ .Values.ndustrial.owner }}
+ndustrial.io/env: {{ .Values.ndustrial.env }}
+ndustrial.io/version: {{ .Values.ndustrial.version }}
+tags.datadoghq.com/env: {{ .Values.ndustrial.env }}
+tags.datadoghq.com/version: {{ .Values.ndustrial.version }}
+tags.datadoghq.com/service: {{ .Values.ndustrial.name }}
 {{- if .Values.contxt.stackId -}}
 contxt/stack.id: {{ .Values.contxt.stackId }}
 contxt/service.id: {{ .Values.contxt.serviceId }}

ndustrial/common/values.yaml

@@ -1,3 +1,22 @@
 ## ndustrial/common
 ## It is required by CI/CD tools and processes.
 exampleValue: common-chart
+
+ndustrial:
+  ## @param ndustrial.name The name of the application (Required)
+  name:
+  ## @param ndustrial.organization The slug of the Organization that owns the application (Required)
+  organization:
+  ## @param ndustrial.owner The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required)
+  owner:
+  ## @param ndustrial.env The environment being deployed into Should most likely be one of: dev, staging, prod, or qa. (Required)
+  env:
+  ## @param ndustrial.version The app version being deployed
+  version:
+contxt:
+  ## @param contxt.stackId The ID of the Contxt Stack that this object belongs to (if applicable)
+  stackId:
+  ## @param contxt.serviceId The ID of the Contxt Service that this object belongs to (if applicable)
+  serviceId:
+  ## @param contxt.serviceType The type of the Contxt Service that this object belongs to (if applicable)
+  serviceType: