Merge pull request #66 from IBM/monitoring-sap

IBM · Jul 18, 2024 · a4f1e8a · a4f1e8a
2 parents 1f8e115 + df13d4b
commit a4f1e8a
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 13 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-05-14T15:25:43Z",
+  "generated_at": "2024-07-18T12:39:33Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -77,6 +77,44 @@
     }
   ],
   "results": {
+    "playbooks/vars/sample-monitoring-sap-parameters.yml": [
+      {
+        "hashed_secret": "cbfdac6008f9cab4083784cbd1874f76618d2a97",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 18,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
+      {
+        "hashed_secret": "48176cd4175cf416538496980586e93c7c595ff8",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 22,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "roles/monitoring_sap/docs/HOWTO-create-IBM-Cloud-monitoring-instance.md": [
+      {
+        "hashed_secret": "4f072fd708a3140c9d9591f21e314eab5e12323c",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 45,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "roles/monitoring_sap/templates/prometheus-sap_monitoring_nr.j2": [
+      {
+        "hashed_secret": "d2e2ab0f407e4ee3cf2ab87d61c31b25a74085e5",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 8,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
     "roles/powervs_prepare_rhel_sap/tasks/main.yml": [
       {
         "hashed_secret": "d2e2ab0f407e4ee3cf2ab87d61c31b25a74085e5",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,16 @@
 # Release Notes
 
+<a name="v2.2.1"></a>
+# [v2.2.1](https://github.com/IBM/ansible-power-linux-sap/releases/tag/v2.2.1) - 18 Jul 2024
+
+## Release Summary
+* fix: private ingestion endpoints for sap monitory role
+
 <a name="v2.2.0"></a>
 # [v2.2.0](https://github.com/IBM/ansible-power-linux-sap/releases/tag/v2.2.0) - 10 Jul 2024
 
 ## Release Summary
-* New monitoring role for SAP supported on SLES:
+* New monitoring role for SAP supported on SLES
 
 <a name="v2.1.1"></a>
 # [v2.1.1](https://github.com/IBM/ansible-power-linux-sap/releases/tag/v2.1.1) - 30 May 2024
@@ -198,7 +204,8 @@ This release will add the following capabilities:
 ## Release Summary
 Initial beta release of IBM Power Virtual Systems SAP with RISE collection, referred to as power_linux_sap
 
-[Changes][v2.2.0]
+[Changes][v2.2.1]
+[v2.2.1]: https://github.com/IBM/ansible-power-linux-sap/compare/v2.2.1...v2.2.0
 [v2.2.0]: https://github.com/IBM/ansible-power-linux-sap/compare/v2.1.1...v2.2.1
 [v2.1.1]: https://github.com/IBM/ansible-power-linux-sap/compare/v2.1.0...v2.1.1
 [v2.1.0]: https://github.com/IBM/ansible-power-linux-sap/compare/v2.0.0...v2.1.0

diff --git a/docs/source/release_notes.rst b/docs/source/release_notes.rst
@@ -139,3 +139,7 @@ Notes
 Version 2.2.0
 Notes
        *  New monitoring role for SAP supported on SLES.
+
+Version 2.2.1
+Notes
+       * fix: private ingestion endpoints for sap monitory role
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: "ibm"
 name: "power_linux_sap"
-version: 2.2.0
+version: 2.2.1
 readme: "README.md"
 description: Collection of Ansible Roles for RHEL/SLES OS to prepare LPARs for installing SAP on Power Systems.
 authors:

diff --git a/playbooks/vars/sample-monitoring-sap-parameters.yml b/playbooks/vars/sample-monitoring-sap-parameters.yml
@@ -18,7 +18,7 @@ sap_hana_sql_systemdb_user: monitoring-user
 sap_hana_sql_systemdb_password: password123
 
 # IBM cloud parameters
-ibmcloud_monitoring_instance_url: https://ingest.prws.us-south.monitoring.cloud.ibm.com/prometheus/remote/write
+ibmcloud_monitoring_instance_url: https://ingest.prws.private.us-south.monitoring.cloud.ibm.com/prometheus/remote/write
 ibmcloud_monitoring_authorization_credentials: a123-b123-c123-12345678ab1232
 
 #netweaver_parameters

diff --git a/roles/monitoring_sap/docs/HOWTO-create-IBM-Cloud-monitoring-instance.md b/roles/monitoring_sap/docs/HOWTO-create-IBM-Cloud-monitoring-instance.md
@@ -45,9 +45,14 @@ remote_write:
     credentials: "d92XXXX-f8XX-4fXX-a6XX-34XXX"
 ```
 
-Use the whole URL as value of the variable <ibmcloud_monitoring_instance_url> in the monitoring configuration.
+add `private.` to the url as private ingestion endpoint <br>
+`https://ingest.prws.private.us-south.monitoring.cloud.ibm.com/prometheus/remote/write` <br>
 
-All private ingestion endpoints per region are listed in [IBM Cloud Document](https://cloud.ibm.com/docs/monitoring?topic=monitoring-prometheus_remote_write#prometheus_remote_write_endpoints)
+general form: <br>
+`https://ingest.prws.private.<REGIONtag>.monitoring.cloud.ibm.com/prometheus/remote/write` <br>
 
+Use the whole URL (version with private) as value of the variable `<ibmcloud_monitoring_instance_url>` in the monitoring configuration. <br>
+All private ingestion endpoints per region are listed in table 3 in [IBM Cloud Document](https://cloud.ibm.com/docs/monitoring?topic=monitoring-prometheus_remote_write#prometheus_remote_write_endpoints)
 
-Use the credentials as value of the variable <ibmcloud_monitoring_authorization_credentials>.
+
+Use the credentials as value of the variable `<ibmcloud_monitoring_authorization_credentials>`.
diff --git a/roles/monitoring_sap/tasks/main.yml b/roles/monitoring_sap/tasks/main.yml
@@ -12,7 +12,7 @@
   block:
 
     - name: Check existence of the variables defined in ./vars/sample-monitoring-sap-parameters.yml
-      fail:
+      ansible.builtin.fail:
         msg: 'variable {{ sap_monitoring_nr }} not defined in the file ./vars/sample-monitoring-sap-parameters.yml '
       when: sap_monitoring_nr is not defined
 
@@ -45,13 +45,13 @@
 
       # checks, if SAP_HANA_CLIENT DB-driver is installed on the monitoring host
     - name: Check existence of /usr/lib64/python3.6/site-packages/hdbcli/dbapi.py
-      stat:
+      ansible.builtin.stat:
         path: /usr/lib64/python3.6/site-packages/hdbcli/dbapi.py
       register: file_hana_driver
 
       # checks, if SAP_HANA_CLIENT /usr/sap/hdbclient/hdbuserstore is installed on the monitoring host
     - name: Check existence of /usr/sap/hdbclient/hdbuserstore
-      stat:
+      ansible.builtin.stat:
         path: /usr/sap/hdbclient/hdbuserstore
       register: file_hana_hdbuserstore
 

diff --git a/roles/monitoring_sap/tasks/sap-hana-client-installation.yml b/roles/monitoring_sap/tasks/sap-hana-client-installation.yml
@@ -13,7 +13,7 @@
     state: directory
     owner: root
     group: root
-    mode: '0750'
+    mode: "0750"
     recurse: true
 
 - name: Extract the SAP HANA Client from the SAR-file with SAPCAR
@@ -32,4 +32,3 @@
 - name: Allow execution of hdbcli to non-root users
   ansible.builtin.shell:
     cmd: "chmod -R a+rx /usr/lib64/python3.*/site-packages/hdbcli/*"
-    #warn: false