From ec7131cf6c29e555953ac04d59e85bdd2e6c8a40 Mon Sep 17 00:00:00 2001
From: przemyslavic <43173646+przemyslavic@users.noreply.github.com>
Date: Tue, 14 Apr 2020 11:44:26 +0200
Subject: [PATCH 1/2] v0.3 Enable node_exporter on logging vms (#1159)

---
 CHANGELOG-0.3.md                                               | 3 ++-
 .../data/common/defaults/configuration/feature-mapping.yml     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-0.3.md b/CHANGELOG-0.3.md
index bbd4a3a302..fc003ec9ea 100644
--- a/CHANGELOG-0.3.md
+++ b/CHANGELOG-0.3.md
@@ -1,10 +1,11 @@
 # Changelog 0.3
 
-## [0.3.1] 2020-03-xx
+## [0.3.1] 2020-04-xx
 
 ### Fixed
 
 - [#839](https://github.com/epiphany-platform/epiphany/issues/839) - Add ServerAliveInterval option to keep SSH connection for long running tasks
+- [#1154](https://github.com/epiphany-platform/epiphany/issues/1154) - Node exporter is not installed on logging vms
 
 ## [0.3.0] 2019-07-31
 
diff --git a/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml b/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml
index 192ed2f307..5d7bbf83da 100644
--- a/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml
+++ b/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml
@@ -57,6 +57,7 @@ specification:
       - elasticsearch
       - elasticsearch-curator
       - kibana
+      - node-exporter
       - filebeat
     load_balancer:
       - haproxy

From ae95e6f0e2de65a81023beb483147a518f4b5511 Mon Sep 17 00:00:00 2001
From: przemyslavic <43173646+przemyslavic@users.noreply.github.com>
Date: Wed, 15 Apr 2020 15:38:37 +0200
Subject: [PATCH 2/2] Fixing typo in the role name rabbitmq (#1165)

---
 CHANGELOG-0.3.md                                                | 1 +
 .../data/common/defaults/configuration/feature-mapping.yml      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-0.3.md b/CHANGELOG-0.3.md
index fc003ec9ea..29f33b21e1 100644
--- a/CHANGELOG-0.3.md
+++ b/CHANGELOG-0.3.md
@@ -6,6 +6,7 @@
 
 - [#839](https://github.com/epiphany-platform/epiphany/issues/839) - Add ServerAliveInterval option to keep SSH connection for long running tasks
 - [#1154](https://github.com/epiphany-platform/epiphany/issues/1154) - Node exporter is not installed on logging vms
+- [#1163](https://github.com/epiphany-platform/epiphany/issues/1163) - [v0.4, v0.3] Typo in the role name rabbitmq
 
 ## [0.3.0] 2019-07-31
 
diff --git a/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml b/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml
index 5d7bbf83da..cbc5694547 100644
--- a/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml
+++ b/core/src/epicli/data/common/defaults/configuration/feature-mapping.yml
@@ -87,7 +87,7 @@ specification:
       - elasticsearch-curator
     single_machine:
       - kubernetes-master
-      - rabbitmql
+      - rabbitmq
       - postgresql
     kubernetes_master:
       - kubernetes-master