From f336e675e4ec927f1e4a2aa6d2868c45ef067a95 Mon Sep 17 00:00:00 2001
From: Grace Wehner <grace.wehner@microsoft.com>
Date: Tue, 15 Dec 2020 11:15:30 -0800
Subject: [PATCH 1/2] add pv fluentd plugin to helm rs config

---
 .../templates/omsagent-rs-configmap.yaml      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/charts/azuremonitor-containers/templates/omsagent-rs-configmap.yaml b/charts/azuremonitor-containers/templates/omsagent-rs-configmap.yaml
index e1bc969cb..baeedf1be 100644
--- a/charts/azuremonitor-containers/templates/omsagent-rs-configmap.yaml
+++ b/charts/azuremonitor-containers/templates/omsagent-rs-configmap.yaml
@@ -20,6 +20,14 @@ data:
       log_level debug
      </source>
 
+     #Kubernetes Persistent Volume inventory
+     <source>
+      type kubepvinventory
+      tag oms.containerinsights.KubePVInventory
+      run_interval 60
+      log_level debug
+     </source>
+
      #Kubernetes events
      <source>
       type kubeevents
@@ -99,6 +107,21 @@ data:
       max_retry_wait 5m
      </match>
 
+     <match oms.containerinsights.KubePVInventory**>
+     type out_oms
+     log_level debug
+     num_threads 5
+     buffer_chunk_limit 4m
+     buffer_type file
+     buffer_path %STATE_DIR_WS%/state/out_oms_kubepv*.buffer
+     buffer_queue_limit 20
+     buffer_queue_full_action drop_oldest_chunk
+     flush_interval 20s
+     retry_limit 10
+     retry_wait 5s
+     max_retry_wait 5m
+    </match>
+
      <match oms.containerinsights.KubeEvents**>
       type out_oms
       log_level debug

From 38bf99127d0e735cf81d0ba59ba667ce5d8e47b5 Mon Sep 17 00:00:00 2001
From: Grace Wehner <grace.wehner@microsoft.com>
Date: Tue, 15 Dec 2020 11:24:47 -0800
Subject: [PATCH 2/2] helm rbac permissions for pv api calls

---
 charts/azuremonitor-containers/templates/omsagent-rbac.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/azuremonitor-containers/templates/omsagent-rbac.yaml b/charts/azuremonitor-containers/templates/omsagent-rbac.yaml
index 4f7408e7c..bd4e9baf3 100644
--- a/charts/azuremonitor-containers/templates/omsagent-rbac.yaml
+++ b/charts/azuremonitor-containers/templates/omsagent-rbac.yaml
@@ -19,7 +19,7 @@ metadata:
     heritage: {{ .Release.Service }}
 rules:
 - apiGroups: [""]
-  resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services"]
+  resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services", "persistentvolumes"]
   verbs: ["list", "get", "watch"]
 - apiGroups: ["apps", "extensions", "autoscaling"]
   resources: ["replicasets", "deployments", "horizontalpodautoscalers"]