From a81da3c9395b4ceb3a42ec90f97acf82c0311bbf Mon Sep 17 00:00:00 2001
From: Szymon Szypulski <ss@viabill.com>
Date: Thu, 7 Apr 2022 08:08:54 +0200
Subject: [PATCH] Bump fluent-plugin-prometheus to 2.0.2

Metrics like emit_count, num_errors, and others are missing when 2.0.1
is used [1][2].

Also, bump .ruby-version to 2.7.4. It is the same as in the docker
image. The previous version is incompatible with some gems used in the
repo.

1. https://github.com/fluent/fluent-plugin-prometheus/issues/195
2. https://github.com/fluent/fluent-plugin-prometheus/commit/0e5d76858f6eaf2b49fe91bca731fddd3df323bb
---
 .ruby-version       | 2 +-
 docker/Gemfile      | 8 ++++----
 docker/Gemfile.lock | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 6a6a3d8..a4dd9db 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.1
+2.7.4
diff --git a/docker/Gemfile b/docker/Gemfile
index 99c6cf6..5217b5d 100644
--- a/docker/Gemfile
+++ b/docker/Gemfile
@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
-# This is separate gemfile for building docker image that has all plugins 
+# This is separate gemfile for building docker image that has all plugins
 # for kubernetes log collection agent
 # List all required gems here and install via bundler to resolve dependencies
-gem "fluentd", ">=1.14.2" 
+gem "fluentd", ">=1.14.2"
 gem "fluent-plugin-systemd", "=1.0.2"
 gem "fluent-plugin-concat", "=2.4.0"
-gem "fluent-plugin-prometheus", "=2.0.1"
+gem "fluent-plugin-prometheus", "=2.0.2"
 gem "fluent-plugin-jq", "=0.5.1"
 gem "fluent-plugin-kubernetes_metadata_filter", ">=2.9.2"
 gem "oj", "=3.11.2"
@@ -20,4 +20,4 @@ gem "rack", ">= 2.1.4"
 gem "fluent-plugin-record-modifier", ">=2.1"
 
 
-gem 'fluent-plugin-splunk-hec', path: 'gem/'
\ No newline at end of file
+gem 'fluent-plugin-splunk-hec', path: 'gem/'
diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock
index 1f35bfa..ba3e7b9 100644
--- a/docker/Gemfile.lock
+++ b/docker/Gemfile.lock
@@ -41,7 +41,7 @@ GEM
       fluentd (>= 0.14.0, < 1.15)
       kubeclient (>= 4.0.0, < 5.0.0)
       lru_redux
-    fluent-plugin-prometheus (2.0.1)
+    fluent-plugin-prometheus (2.0.2)
       fluentd (>= 1.9.1, < 2)
       prometheus-client (>= 2.1.0)
     fluent-plugin-record-modifier (2.1.0)
@@ -165,7 +165,7 @@ DEPENDENCIES
   fluent-plugin-concat (= 2.4.0)
   fluent-plugin-jq (= 0.5.1)
   fluent-plugin-kubernetes_metadata_filter (>= 2.9.2)
-  fluent-plugin-prometheus (= 2.0.1)
+  fluent-plugin-prometheus (= 2.0.2)
   fluent-plugin-record-modifier (>= 2.1)
   fluent-plugin-splunk-hec!
   fluent-plugin-systemd (= 1.0.2)
@@ -179,4 +179,4 @@ DEPENDENCIES
   rack (>= 2.1.4)
 
 BUNDLED WITH
-   2.2.32
+   2.3.11