Merge branch 'v0.3' into 0.3.1-reverse-merge

hitachienergy · Apr 17, 2020 · e09851b · e09851b
2 parents 45acd12 + ae95e6f
commit e09851b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG-0.3.md b/CHANGELOG-0.3.md
@@ -8,6 +8,8 @@
 - [#1016](https://github.com/epiphany-platform/epiphany/issues/1016) - Disable verify, backup and recovery as they are not fully implemented
 - [#1105](https://github.com/epiphany-platform/epiphany/issues/1105) - [v0.3] failing on task: Install container-selinux for RHEL
 - [#1106](https://github.com/epiphany-platform/epiphany/issues/1106) - [v0.3] Epicli exiting with exit code 0 despite errors
+- [#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
 - Added default machines for rabbitmq and load_balancer components
 
 ## [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
@@ -57,6 +57,7 @@ specification:
       - elasticsearch
       - elasticsearch-curator
       - kibana
+      - node-exporter
       - filebeat
     load_balancer:
       - haproxy
@@ -86,7 +87,7 @@ specification:
       - elasticsearch-curator
     single_machine:
       - kubernetes-master
-      - rabbitmql
+      - rabbitmq
       - postgresql
     kubernetes_master:
       - kubernetes-master