diff --git a/.gitignore b/.gitignore
index 4dcbcdb..3549b1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ SOURCES/crypto_policies-1.2.3.tar.gz
SOURCES/firewall-1.1.0.tar.gz
SOURCES/ha_cluster-1.4.1.tar.gz
SOURCES/kdump-1.2.2.tar.gz
-SOURCES/kernel_settings-1.1.4.tar.gz
+SOURCES/kernel_settings-1.1.6.tar.gz
SOURCES/logging-1.8.1.tar.gz
SOURCES/metrics-1.4.1.tar.gz
SOURCES/nbde_client-1.2.0.tar.gz
@@ -18,6 +18,6 @@ SOURCES/postfix-1.1.3.tar.gz
SOURCES/selinux-1.3.4.tar.gz
SOURCES/ssh-1.1.4.tar.gz
SOURCES/storage-1.7.0.tar.gz
-SOURCES/timesync-1.6.5.tar.gz
+SOURCES/timesync-1.6.6.tar.gz
SOURCES/tlog-1.2.5.tar.gz
SOURCES/vpn-1.3.2.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index 68f4142..15b0078 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -8,7 +8,7 @@ a7a5fb799f9446f27f1d19c6b1610bbe13c6ae04 SOURCES/community-general-4.4.0.tar.gz
fcb8d48ccaeba886859ce6afd3d14bbb3f8a5667 SOURCES/firewall-1.1.0.tar.gz
9a990a4908bdf3269bce4f214907623780a5e221 SOURCES/ha_cluster-1.4.1.tar.gz
a1c9c89dea1dbe2410465c29ad0e1d3637ac5f52 SOURCES/kdump-1.2.2.tar.gz
-72bd06d25e4c841e53be7fa1330c859ac8f76a6d SOURCES/kernel_settings-1.1.4.tar.gz
+0a681d1e3b236c4750d663f2a833e786a5e958ab SOURCES/kernel_settings-1.1.6.tar.gz
e530528ba5f9478cc8604aa6612388ea8e5078af SOURCES/logging-1.8.1.tar.gz
c0dbbea68bba05ee98c3e1a686c328e741abe763 SOURCES/metrics-1.4.1.tar.gz
641ab2f8cd9916a43c8b580907203a3304110d1e SOURCES/nbde_client-1.2.0.tar.gz
@@ -18,6 +18,6 @@ c0dbbea68bba05ee98c3e1a686c328e741abe763 SOURCES/metrics-1.4.1.tar.gz
4e5c5216814577ee55304721e5c811ed8857efbc SOURCES/selinux-1.3.4.tar.gz
f38972c4b22a9f226b58725c7e9ba8fac692bba2 SOURCES/ssh-1.1.4.tar.gz
0728b4e01261f84ce470431a4ea21907db75f26a SOURCES/storage-1.7.0.tar.gz
-b9f1b88b8eda052161bc86473b383ad88692249c SOURCES/timesync-1.6.5.tar.gz
+0bd118c9df9bf556a76d42c92bde11fde5553eba SOURCES/timesync-1.6.6.tar.gz
17e6f3d437d161143c87b6709a42a3eff6ef7df0 SOURCES/tlog-1.2.5.tar.gz
d1bb00636c04bc1b2d94ce0e491afe9ef921cd56 SOURCES/vpn-1.3.2.tar.gz
diff --git a/SOURCES/metrics-symlink_follow.diff b/SOURCES/metrics-symlink_follow.diff
new file mode 100644
index 0000000..bbb713f
--- /dev/null
+++ b/SOURCES/metrics-symlink_follow.diff
@@ -0,0 +1,44 @@
+From e7cc032dae8b740428b334eac179b4aa243f0aea Mon Sep 17 00:00:00 2001
+From: "github-actions[bot]"
+ <41898282+github-actions[bot]@users.noreply.github.com>
+Date: Tue, 1 Mar 2022 02:35:22 +0000
+Subject: [PATCH] Squashed 'vendor/github.com/performancecopilot/ansible-pcp/'
+ changes from 2da846b..e41f4bd
+
+e41f4bd Merge branch 'nhosoi-ansible_managed'
+49337e0 Add "follow: yes" to the template task in the mssql and elasticsearch subrole.
+
+git-subtree-dir: vendor/github.com/performancecopilot/ansible-pcp
+git-subtree-split: e41f4bd98809ae49534e3f24feec3ce9c49c86ed
+---
+ roles/elasticsearch/tasks/main.yml | 1 +
+ roles/mssql/tasks/main.yml | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml
+index 2ca9768..d806fad 100644
+--- a/roles/elasticsearch/tasks/main.yml
++++ b/roles/elasticsearch/tasks/main.yml
+@@ -45,6 +45,7 @@
+ template:
+ src: elasticsearch.conf.j2
+ dest: "{{ __elasticsearch_conf }}"
++ follow: yes
+ mode: 0600
+ when:
+ - elasticsearch_metrics_provider == 'pcp'
+diff --git a/roles/mssql/tasks/main.yml b/roles/mssql/tasks/main.yml
+index e951d1e..d6c9525 100644
+--- a/roles/mssql/tasks/main.yml
++++ b/roles/mssql/tasks/main.yml
+@@ -34,6 +34,7 @@
+ template:
+ src: mssql.conf.j2
+ dest: "{{ __mssql_conf }}"
++ follow: yes
+ mode: 0600
+ when: mssql_metrics_provider == 'pcp'
+
+--
+2.34.1
+
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index f9eee0d..e02c8fd 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -30,7 +30,7 @@ Name: linux-system-roles
%endif
Url: https://github.com/linux-system-roles
Summary: Set of interfaces for unified system management
-Version: 1.15.0
+Version: 1.15.1
Release: 1%{?dist}
#Group: Development/Libraries
@@ -135,7 +135,7 @@ BuildRequires: %{ansible_build_dep}
#%%defcommit 3 cbe4bf262bffae3bf53e531662237741954c4182
%global rolename3 timesync
-%deftag 3 1.6.5
+%deftag 3 1.6.6
#%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1
%global rolename4 kdump
@@ -159,7 +159,7 @@ BuildRequires: %{ansible_build_dep}
#%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7
%global rolename9 kernel_settings
-%deftag 9 1.1.4
+%deftag 9 1.1.6
#%%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f
%global rolename10 logging
@@ -242,6 +242,8 @@ Source998: collection_readme.sh
Patch51: network-disable-bondtests.diff
+Patch71: metrics-symlink_follow.diff
+
BuildArch: noarch
%if %{with html}
@@ -350,6 +352,7 @@ if [ "$rolesdir" != "$realrolesdir" ]; then
mv "$realrolesdir" .
rm -rf vendor
fi
+%patch71 -p1
cd ..
%if 0%{?rhel}
@@ -710,6 +713,19 @@ fi
%endif
%changelog
+* Thu Mar 3 2022 Rich Megginson <rmeggins@redhat.com> - 1.15.1-1
+- kernel_settings error configobj not found on RHEL 8.6 managed hosts
+ Resolves rhbz#2058772 (EL8)
+ Resolves rhbz#2058756 (EL9)
+- timesync: basic-smoke test failure in timesync/tests_ntp.yml
+ Resolves rhbz#2059293 (EL8)
+ Resolves rhbz#2058645 (EL9)
+
+* Tue Mar 1 2022 Noriko Hosoi <nhosoi@redhat.com> - 1.15.0-2
+- metrics - follow symlinks for the mssql and elasticsearch configuration paths
+ Resolves rhbz#2058655 (EL8)
+ Resolves rhbz#2058777 (EL9)
+
* Tue Feb 20 2022 Rich Megginson <rmeggins@redhat.com> - 1.15.0-1
- firewall - ensure target changes take effect immediately
Resolves rhbz#2057172 (EL8)