Merge pull request #126 from ARGOeu/devel

Version 1.8.2

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Release notes for argo-puppet module
 
+### 1.8.2 - 4 Jul 2024
+
+* AO-986 Include tenant entry in argo-sensu-tools.conf.erb template
+
 ### 1.8.1 - 27 Jun 2024
 
 * AO-985 Include repo for HTCondor packages on Rocky 9

README.md

@@ -220,7 +220,8 @@ Setting `include_passive` parameter to `true` triggers installation and configur
 argo::mon::sensutools::voname        : tenant
 argo::mon::sensutools::sensu_url     : https://sensu.argo.grnet.gr:8080/
 argo::mon::sensutools::sensu_token   : <sensu-token>
-argo::mon::sensutools::namespace     : TENANT
+argo::mon::sensutools::namespace     : tenant_namespace
+argo::mon::sensutools::tenant        : TENANT
 argo::mon::sensutools::webapi_url    : https://api.argo.grnet.gr/api/v2/metric_profiles
 argo::mon::sensutools::webapi_token  : <webapi-token>
 argo::mon::sensutools::metricprofiles: ARGO-MON, ARGO-MON-CRITICAL
@@ -261,7 +262,7 @@ argo::mon::condor::local_config: puppet:///path/to/local_config/file
 
 #### ARC-CE probes
 
-For ARC-CE probes to work properly, besides the package providing the probes (`nordugrid-arc-nagios-plugins`), also packages `argo-probe-igtf` and `argo-probe-sensu` need to be additionally installed. There is also a configuration file that needs to be placed in proper directory (default file is `files/mon/egi/90-local.ini`). If The default file is sufficient, the `.yaml` file should simply contain:
+For ARC-CE probes to work properly, besides the package providing the probes (`nordugrid-arc-nagios-plugins`), also packages `nordugrid-arc-nagios-plugins-egi`, `argo-probe-igtf` and `argo-probe-sensu` need to be additionally installed. There is also a configuration file that needs to be placed in proper directory (default file is `files/mon/egi/90-local.ini`). If The default file is sufficient, the `.yaml` file should simply contain:
 
 ```yaml
 argo::mon::arc: true

manifests/mon/sensutools.pp

@@ -3,6 +3,7 @@
   $sensu_url      = '',
   $sensu_token    = '',
   $namespace      = '',
+  $tenant         = '',
   $webapi_url     = '',
   $webapi_token   = '',
   $metricprofiles = '',

templates/mon/sensutools/argo-sensu-tools.conf.erb

@@ -6,6 +6,7 @@ voname = <%= @voname  %>
 url = <%= @sensu_url %>
 token = <%= @sensu_token %>
 namespace = <%= @namespace %>
+tenant = <%= @tenant %>
 
 [WEB-API]
 url = <%= @webapi_url %>