From 040b128d4cee6b7211aa847469454ebf4ae983ca Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Thu, 15 Sep 2022 09:41:13 -0400
Subject: [PATCH] update yaml config files with defaults for logging changes
 (#1031)

* update yaml config files with defaults for logging changes

* Update CHANGELOG
---
 CHANGELOG.md                  | 12 ++++++++++++
 config/default.yml            |  2 ++
 config/production.yml         |  1 +
 deploy/charts/flipt/README.md |  3 ---
 4 files changed, 15 insertions(+), 3 deletions(-)
 delete mode 100644 deploy/charts/flipt/README.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb5b5f8413..a7b8b0bfb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@
 This 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).
 
+## Unreleased
+
+### Added
+
+- Ability to log as structure JSON [#1027](https://github.com/flipt-io/flipt/pull/1027)
+- Ability to configure GRPC log level seperately from main service log level [#1029](https://github.com/flipt-io/flipt/pull/1029)
+
+### Changed
+
+- Configuration 'enums' are encoding correctly as JSON [#1030](https://github.com/flipt-io/flipt/pull/1030)
+- Dependency updates
+
 ## [v1.11.0](https://github.com/markphelps/flipt/releases/tag/v1.11.0) - 2022-09-12
 
 ### Added
diff --git a/config/default.yml b/config/default.yml
index 5b45fe039a..d9a4bd0df0 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -1,6 +1,8 @@
 # log:
 #   level: INFO
 #   file:
+#   encoding: console
+#   grpc_level: ERROR
 
 # ui:
 #   enabled: true
diff --git a/config/production.yml b/config/production.yml
index 76383aa210..b3426fb938 100644
--- a/config/production.yml
+++ b/config/production.yml
@@ -1,5 +1,6 @@
 log:
   level: WARN
+  encoding: json
 
 server:
   protocol: https
diff --git a/deploy/charts/flipt/README.md b/deploy/charts/flipt/README.md
deleted file mode 100644
index efe77ad7b3..0000000000
--- a/deploy/charts/flipt/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Flipt Helm Chart
-
-The Flipt Helm Chart has moved to [https://github.com/flipt-io/helm-charts](https://github.com/flipt-io/helm-charts).
\ No newline at end of file