From 13d6ae2b20871d78a6fd3e844395812f2e8cef8f Mon Sep 17 00:00:00 2001
From: Pierre Tessier <pierre@honeycomb.io>
Date: Sat, 9 Oct 2021 08:34:55 -0400
Subject: [PATCH] [honeycomb] update to multi-arch agent (2.2.0) (#64)

* add core component defaults

* add core component defaults

* bump to version 2.2.0

* add stable ingress support

* Revert "add stable ingress support"

This reverts commit 047b2da3b2ed4214692f7d4f04b7659e72639b74.
---
 charts/honeycomb/Chart.yaml  |  4 ++--
 charts/honeycomb/README.md   |  6 ++++++
 charts/honeycomb/values.yaml | 16 ++++++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/charts/honeycomb/Chart.yaml b/charts/honeycomb/Chart.yaml
index 7f395843..15dfa24d 100644
--- a/charts/honeycomb/Chart.yaml
+++ b/charts/honeycomb/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: honeycomb
 description: Honeycomb Kubernetes Agent
-version: 1.0.4
-appVersion: 2.1.3
+version: 1.1.0
+appVersion: 2.2.0
 keywords:
   - observability
   - tracing
diff --git a/charts/honeycomb/README.md b/charts/honeycomb/README.md
index e1daf2f2..da222668 100644
--- a/charts/honeycomb/README.md
+++ b/charts/honeycomb/README.md
@@ -114,6 +114,12 @@ The following table lists the configurable parameters of the Honeycomb chart, an
 
 ## Upgrading
 
+### Upgrading from 1.0.x or earlier
+The default log collection now includes all standard Kubernetes services. 
+The following Kubernetes components will have logs collection enabled by default: 
+api-server, controller, scheduler, coredns, kube-proxy. 
+You can override this using the `watchers` parameter.
+
 ### Upgrading from 0.11.0 or earlier
 
 The `agent.` prefix for properties has been deprecated. 
diff --git a/charts/honeycomb/values.yaml b/charts/honeycomb/values.yaml
index a06cfd73..8ce7d1e6 100644
--- a/charts/honeycomb/values.yaml
+++ b/charts/honeycomb/values.yaml
@@ -9,11 +9,23 @@ honeycomb:
 
 watchers:
   - dataset: kubernetes-logs
-    labelSelector: component=kube-controller-manager
+    labelSelector: "component=kube-apiserver,tier=control-plane"
     namespace: kube-system
     parser: glog
   - dataset: kubernetes-logs
-    labelSelector: component=kube-scheduler
+    labelSelector: "component=kube-scheduler,tier=control-plane"
+    namespace: kube-system
+    parser: glog
+  - dataset: kubernetes-logs
+    labelSelector: "component=kube-controller-manager,tier=control-plane"
+    namespace: kube-system
+    parser: glog
+  - dataset: kubernetes-logs
+    labelSelector: "k8s-app=kube-proxy"
+    namespace: kube-system
+    parser: glog
+  - dataset: kubernetes-logs
+    labelSelector: "k8s-app=kube-dns"
     namespace: kube-system
     parser: glog