Merge pull request #647 from solarwinds/prepareCollectorImage_0_10_1

Create branch for 3.4.0
solarwinds · Jun 26, 2024 · 726436e · 726436e
2 parents 532953f + 8b0c98c
commit 726436e
Show file tree

Hide file tree

Showing 51 changed files with 1,451 additions and 1,838 deletions.
diff --git a/.github/cr.sh b/.github/cr.sh
@@ -71,14 +71,12 @@ push_files() {
         --jq '.sha')
 
     MESSAGE="New release $release_name"
-    CONTENT=$(base64 -i .cr-index/index.yaml)
 
     # Push new index.yaml to the feature branch
     echo "Pushing new index.yaml to branch '$branch_name'..."
     gh api --method PUT /repos/solarwinds/swi-k8s-opentelemetry-collector/contents/index.yaml \
         --field message="$MESSAGE" \
-        --field content="$CONTENT" \
-        --field encoding="base64" \
+        --field content=@<(base64 -i .cr-index/index.yaml) \
         --field branch="$branch_name" \
         --field sha="$SHA"
 }

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -25,14 +25,15 @@ updates:
       - go
       - Skip Changelog
     schedule:
-      interval: weekly
-      day: sunday
+      interval: "daily"
     allow:
       # Allow both direct and indirect updates for all packages
       - dependency-type: "all"
     ignore:
       - dependency-name: "github.com/open-telemetry/opentelemetry-collector-contrib*"
       - dependency-name: "go.opentelemetry.io/collector*"
+    # Disable version updates
+    open-pull-requests-limit: 0
     groups:
       minor-and-patch:
         applies-to: security-updates
@@ -41,27 +42,3 @@ updates:
         update-types:
         - "patch"
         - "minor"
-  - package-ecosystem: gomod
-    directory: /src/processor/k8sattributesprocessor
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-    ignore:
-      - dependency-name: "github.com/open-telemetry/opentelemetry-collector-contrib*"
-      - dependency-name: "go.opentelemetry.io/collector*"
-  - package-ecosystem: gomod
-    directory: /src/processor/swmetricstransformprocessor
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
-    ignore:
-      - dependency-name: "github.com/open-telemetry/opentelemetry-collector-contrib*"
-      - dependency-name: "go.opentelemetry.io/collector*"
diff --git a/README.md b/README.md
@@ -34,8 +34,8 @@ Walk through Add Kubernetes wizard in [SolarWinds Observability](https://documen
 
 ## Limitations
 
-- Supported Kubernetes version: 1.18 and higher.
-  - Local Kubernetes deployments (e.q. Minikube) are not supported (although most of the functionality may be working).
+- Each Kubernetes version is supported for 15 months after its initial release. For example, version 1.27 released on April 11, 2023 is supported until July 11, 2024. For release dates for individual Kubernetes versions, see [Patch Releases](https://kubernetes.io/releases/patch-releases/#detailed-release-history-for-active-branches) in Kubernetes documentation. 
+  - Local Kubernetes deployments (e.q. Minikube, Docker Desktop) are not supported (although most of the functionality may be working).
   - Note: since Kubernetes v1.24 Docker container runtime will not be reporting pod level network metrics (`kubenet` and other network plumbing was removed from upstream as part of the dockershim removal/deprecation)
 - Supported architectures: Linux x86-64 (`amd64`), Linux ARM (`arm64`), Windows x86-64 (`amd64`).
 

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.22.2-bookworm as base
+FROM docker.io/library/golang:1.22.4-bookworm as base
 WORKDIR /src
 COPY ["./src/", "./src/"]
 

diff --git a/build/docker/Dockerfile.Windows-2022 b/build/docker/Dockerfile.Windows-2022
@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.22.2-nanoserver-ltsc2022@sha256:0b8935555f09ae9b1ac6d261979fec84f7aa089c38d9f5eec319ec1742173233 as base
+FROM docker.io/library/golang:1.22.4-nanoserver-ltsc2022@sha256:08fb710ab1f56fd09bbfee3d3d23ee871016e6315bfeb8572f9be77837145652 as base
 WORKDIR /src
 COPY ["./src/", "./src/"]
 

diff --git a/build/docker/structure-test.yaml b/build/docker/structure-test.yaml
@@ -17,4 +17,4 @@ commandTests:
   - name: "swi-otelcol is working in the image"
     command: "/swi-otelcol"
     args: ["-v"]
-    expectedOutput: ["swi-k8s-opentelemetry-collector version 0.10.0"]
+    expectedOutput: ["swi-k8s-opentelemetry-collector version 0.10.1"]
diff --git a/deploy/helm/CHANGELOG.md b/deploy/helm/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [3.4.0-alpha.1] - 2024-05-09
+
+### Fixed
+
+- Only `k8s.cluster.version` metric has attribute `sw.k8s.cluster.version`
+
 ## [3.3.0] - 2024-04-26
 
 ### Added

diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: swo-k8s-collector
-version: 3.3.0
+version: 3.4.0-alpha.1
 appVersion: "0.10.0"
 description: SolarWinds Kubernetes Integration
 keywords:

diff --git a/deploy/helm/metrics-collector-config.yaml b/deploy/helm/metrics-collector-config.yaml
@@ -644,6 +644,9 @@ processors:
           - action: aggregate_labels
             label_set: [git_version]
             aggregation_type: sum
+          - action: update_label
+            label: git_version
+            new_label: sw.k8s.cluster.version            
       - include: k8s.kubernetes_build_info
         action: update
         new_name: k8s.kubernetes_build_info_temp
@@ -764,7 +767,7 @@ processors:
       - replicaset
       - job_name
       - cronjob
-      - git_version
+      - sw.k8s.cluster.version
       - internal_ip
       - job_condition
       - persistentvolumeclaim

diff --git a/deploy/helm/templates/_common-config.tpl b/deploy/helm/templates/_common-config.tpl
@@ -444,7 +444,7 @@ groupbyattrs/all:
     - replicaset
     - job_name
     - cronjob
-    - git_version
+    - sw.k8s.cluster.version
     - internal_ip
     - job_condition
     - persistentvolumeclaim
@@ -496,10 +496,6 @@ resource/metrics:
       value: ${CLUSTER_NAME}
       action: insert
 
-    - key: sw.k8s.cluster.version
-      from_attribute: git_version
-      action: insert
-
     # k8s.node.name
     - key: sw.k8s.node.version
       from_attribute: kubelet_version

diff --git a/deploy/helm/tests/__snapshot__/logs-fargate-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/logs-fargate-config-map_test.yaml.snap
@@ -22,7 +22,7 @@ Fargate logging ConfigMap spec should include additional filters when they are c
           Match *
           Add sw.k8s.cluster.uid <CLUSTER_UID>
           Add sw.k8s.log.type container
-          Add sw.k8s.agent.manifest.version "3.3.0"
+          Add sw.k8s.agent.manifest.version "3.4.0-alpha.1"
     flb_log_cw: "false"
     output.conf: |
       [OUTPUT]
@@ -60,7 +60,7 @@ Fargate logging ConfigMap spec should match snapshot when Fargate logging is ena
           Match *
           Add sw.k8s.cluster.uid <CLUSTER_UID>
           Add sw.k8s.log.type container
-          Add sw.k8s.agent.manifest.version "3.3.0"
+          Add sw.k8s.agent.manifest.version "3.4.0-alpha.1"
     flb_log_cw: "false"
     output.conf: |
       [OUTPUT]

diff --git a/deploy/helm/tests/__snapshot__/metrics-collector-config-map-fargate_test.yaml.snap b/deploy/helm/tests/__snapshot__/metrics-collector-config-map-fargate_test.yaml.snap
@@ -684,7 +684,7 @@ Metrics config should match snapshot when using default values:
           - replicaset
           - job_name
           - cronjob
-          - git_version
+          - sw.k8s.cluster.version
           - internal_ip
           - job_condition
           - persistentvolumeclaim
@@ -1684,6 +1684,9 @@ Metrics config should match snapshot when using default values:
               aggregation_type: sum
               label_set:
               - git_version
+            - action: update_label
+              label: git_version
+              new_label: sw.k8s.cluster.version
           - action: update
             include: k8s.kubernetes_build_info
             new_name: k8s.kubernetes_build_info_temp
@@ -1770,9 +1773,6 @@ Metrics config should match snapshot when using default values:
           - action: insert
             key: k8s.cluster.name
             value: ${CLUSTER_NAME}
-          - action: insert
-            from_attribute: git_version
-            key: sw.k8s.cluster.version
           - action: insert
             from_attribute: kubelet_version
             key: sw.k8s.node.version

diff --git a/deploy/helm/tests/__snapshot__/metrics-collector-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/metrics-collector-config-map_test.yaml.snap
@@ -684,7 +684,7 @@ Metrics config should match snapshot when fargate is enabled:
           - replicaset
           - job_name
           - cronjob
-          - git_version
+          - sw.k8s.cluster.version
           - internal_ip
           - job_condition
           - persistentvolumeclaim
@@ -1684,6 +1684,9 @@ Metrics config should match snapshot when fargate is enabled:
               aggregation_type: sum
               label_set:
               - git_version
+            - action: update_label
+              label: git_version
+              new_label: sw.k8s.cluster.version
           - action: update
             include: k8s.kubernetes_build_info
             new_name: k8s.kubernetes_build_info_temp
@@ -1770,9 +1773,6 @@ Metrics config should match snapshot when fargate is enabled:
           - action: insert
             key: k8s.cluster.name
             value: ${CLUSTER_NAME}
-          - action: insert
-            from_attribute: git_version
-            key: sw.k8s.cluster.version
           - action: insert
             from_attribute: kubelet_version
             key: sw.k8s.node.version
@@ -3019,7 +3019,7 @@ Metrics config should match snapshot when using Prometheus url with extra_scrape
           - replicaset
           - job_name
           - cronjob
-          - git_version
+          - sw.k8s.cluster.version
           - internal_ip
           - job_condition
           - persistentvolumeclaim
@@ -4019,6 +4019,9 @@ Metrics config should match snapshot when using Prometheus url with extra_scrape
               aggregation_type: sum
               label_set:
               - git_version
+            - action: update_label
+              label: git_version
+              new_label: sw.k8s.cluster.version
           - action: update
             include: k8s.kubernetes_build_info
             new_name: k8s.kubernetes_build_info_temp
@@ -4105,9 +4108,6 @@ Metrics config should match snapshot when using Prometheus url with extra_scrape
           - action: insert
             key: k8s.cluster.name
             value: ${CLUSTER_NAME}
-          - action: insert
-            from_attribute: git_version
-            key: sw.k8s.cluster.version
           - action: insert
             from_attribute: kubelet_version
             key: sw.k8s.node.version
@@ -5296,7 +5296,7 @@ Metrics config should match snapshot when using default values:
           - replicaset
           - job_name
           - cronjob
-          - git_version
+          - sw.k8s.cluster.version
           - internal_ip
           - job_condition
           - persistentvolumeclaim
@@ -6296,6 +6296,9 @@ Metrics config should match snapshot when using default values:
               aggregation_type: sum
               label_set:
               - git_version
+            - action: update_label
+              label: git_version
+              new_label: sw.k8s.cluster.version
           - action: update
             include: k8s.kubernetes_build_info
             new_name: k8s.kubernetes_build_info_temp
@@ -6382,9 +6385,6 @@ Metrics config should match snapshot when using default values:
           - action: insert
             key: k8s.cluster.name
             value: ${CLUSTER_NAME}
-          - action: insert
-            from_attribute: git_version
-            key: sw.k8s.cluster.version
           - action: insert
             from_attribute: kubelet_version
             key: sw.k8s.node.version

diff --git a/deploy/helm/tests/__snapshot__/node-collector-config-map-windows_test.yaml.snap b/deploy/helm/tests/__snapshot__/node-collector-config-map-windows_test.yaml.snap
@@ -229,7 +229,7 @@ Node collector config for windows nodes should match snapshot when using default
           - replicaset
           - job_name
           - cronjob
-          - git_version
+          - sw.k8s.cluster.version
           - internal_ip
           - job_condition
           - persistentvolumeclaim
@@ -814,9 +814,6 @@ Node collector config for windows nodes should match snapshot when using default
           - action: insert
             key: k8s.cluster.name
             value: ${CLUSTER_NAME}
-          - action: insert
-            from_attribute: git_version
-            key: sw.k8s.cluster.version
           - action: insert
             from_attribute: kubelet_version
             key: sw.k8s.node.version

diff --git a/deploy/helm/tests/__snapshot__/node-collector-config-map_test.yaml.snap b/deploy/helm/tests/__snapshot__/node-collector-config-map_test.yaml.snap
@@ -229,7 +229,7 @@ Node collector config should match snapshot when autodiscovery is disabled:
           - replicaset
           - job_name
           - cronjob
-          - git_version
+          - sw.k8s.cluster.version
           - internal_ip
           - job_condition
           - persistentvolumeclaim
@@ -834,9 +834,6 @@ Node collector config should match snapshot when autodiscovery is disabled:
           - action: insert
             key: k8s.cluster.name
             value: ${CLUSTER_NAME}
-          - action: insert
-            from_attribute: git_version
-            key: sw.k8s.cluster.version
           - action: insert
             from_attribute: kubelet_version
             key: sw.k8s.node.version
@@ -1405,7 +1402,7 @@ Node collector config should match snapshot when fargate is enabled:
           - replicaset
           - job_name
           - cronjob
-          - git_version
+          - sw.k8s.cluster.version
           - internal_ip
           - job_condition
           - persistentvolumeclaim
@@ -2010,9 +2007,6 @@ Node collector config should match snapshot when fargate is enabled:
           - action: insert
             key: k8s.cluster.name
             value: ${CLUSTER_NAME}
-          - action: insert
-            from_attribute: git_version
-            key: sw.k8s.cluster.version
           - action: insert
             from_attribute: kubelet_version
             key: sw.k8s.node.version
@@ -2550,7 +2544,7 @@ Node collector config should match snapshot when fargate is enabled and autodisc
           - replicaset
           - job_name
           - cronjob
-          - git_version
+          - sw.k8s.cluster.version
           - internal_ip
           - job_condition
           - persistentvolumeclaim
@@ -3155,9 +3149,6 @@ Node collector config should match snapshot when fargate is enabled and autodisc
           - action: insert
             key: k8s.cluster.name
             value: ${CLUSTER_NAME}
-          - action: insert
-            from_attribute: git_version
-            key: sw.k8s.cluster.version
           - action: insert
             from_attribute: kubelet_version
             key: sw.k8s.node.version
@@ -3657,7 +3648,7 @@ Node collector config should match snapshot when using default values:
           - replicaset
           - job_name
           - cronjob
-          - git_version
+          - sw.k8s.cluster.version
           - internal_ip
           - job_condition
           - persistentvolumeclaim
@@ -4262,9 +4253,6 @@ Node collector config should match snapshot when using default values:
           - action: insert
             key: k8s.cluster.name
             value: ${CLUSTER_NAME}
-          - action: insert
-            from_attribute: git_version
-            key: sw.k8s.cluster.version
           - action: insert
             from_attribute: kubelet_version
             key: sw.k8s.node.version

diff --git a/skaffold.yaml b/skaffold.yaml
@@ -87,6 +87,8 @@ deploy:
               sending_queue:
                 offload_to_disk: true
             logs:
+              # journal on Docker Desktop is not supported
+              journal: false
               filter:
                 include:
                   record_attributes: