diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml
index 3601209bef..4546fe203e 100755
--- a/stable/fluent-bit/Chart.yaml
+++ b/stable/fluent-bit/Chart.yaml
@@ -1,5 +1,5 @@
 name: fluent-bit
-version: 0.5.0
+version: 0.5.1
 appVersion: 0.13.0
 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX
 keywords:
diff --git a/stable/fluent-bit/README.md b/stable/fluent-bit/README.md
index 94b7377f80..330bf87de1 100644
--- a/stable/fluent-bit/README.md
+++ b/stable/fluent-bit/README.md
@@ -76,6 +76,9 @@ The following tables lists the configurable parameters of the Fluent-Bit chart a
 | `resources.requests.memory`        | Memory request                             | `200Mi`                                           |
 | `tolerations`                      | Optional daemonset tolerations             | `NULL`                                            |
 | `nodeSelector`                     | Node labels for fluent-bit pod assignment  | `NULL`                                            |
+| `metrics.enabled`                  | Specifies whether a service for metrics should be exposed | `false`                            |
+| `metrics.service.port`             | Port on where metrics should be exposed    | `2020`                                            |
+| `metrics.service.type`             | Service type for metrics                   | `ClusterIP`                                       |
 | | | |
 
 
diff --git a/stable/fluent-bit/templates/config.yaml b/stable/fluent-bit/templates/config.yaml
index 2a223f1c75..9467ca2ac0 100644
--- a/stable/fluent-bit/templates/config.yaml
+++ b/stable/fluent-bit/templates/config.yaml
@@ -12,6 +12,11 @@ data:
         Daemon       Off
         Log_Level    info
         Parsers_File parsers.conf
+{{- if .Values.metrics.enabled }}
+        HTTP_Server  On
+        HTTP_Listen  0.0.0.0
+        HTTP_Port    2020
+{{- end }}
 
     [INPUT]
         Name             tail
diff --git a/stable/fluent-bit/templates/daemonset.yaml b/stable/fluent-bit/templates/daemonset.yaml
index b51dda53e4..ba978c51d7 100644
--- a/stable/fluent-bit/templates/daemonset.yaml
+++ b/stable/fluent-bit/templates/daemonset.yaml
@@ -26,6 +26,12 @@ spec:
 {{ toYaml .Values.env | indent 10 }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
+{{- if .Values.metrics.enabled }}
+        ports:
+          - name: metrics
+            containerPort: 2020
+            protocol: TCP
+{{- end }}
         volumeMounts:
         - name: varlog
           mountPath: /var/log
diff --git a/stable/fluent-bit/templates/service.yaml b/stable/fluent-bit/templates/service.yaml
new file mode 100644
index 0000000000..dcebf49181
--- /dev/null
+++ b/stable/fluent-bit/templates/service.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "fluent-bit.fullname" . }}-metrics
+  labels:
+    app: {{ template "fluent-bit.fullname" . }}
+spec:
+  type: {{ .Values.metrics.service.type}}
+  sessionAffinity: None
+  ports:
+  - port: {{ .Values.metrics.service.port }}
+    targetPort: metrics
+    name: metrics
+  selector:
+    app: {{ template "fluent-bit.fullname" . }}
+{{- end }}
diff --git a/stable/fluent-bit/values.yaml b/stable/fluent-bit/values.yaml
index 1c3c4a2ec6..b9dfd149bf 100644
--- a/stable/fluent-bit/values.yaml
+++ b/stable/fluent-bit/values.yaml
@@ -8,6 +8,13 @@ image:
     tag: 0.13.0
   pullPolicy: Always
 
+# When enabled, exposes json and prometheus metrics on {{ .Release.Name }}-metrics service
+metrics:
+  enabled: false
+  service:
+    port: 2020
+    type: ClusterIP
+
 backend:
   type: forward
   forward: