Merge pull request #135 from ARGOeu/devel

Version 1.8.5

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Release notes for argo-puppet module
 
+### 1.8.5 - 11 Nov 2024
+
+* AO-1004 Add configuration file for gfal in ARGO puppet module
+
 ### 1.8.4 - 5 Nov 2024
 
 * AO-1002 Disable IPv6 through ARGO Puppet module

README.md

@@ -291,9 +291,13 @@ and everything will be configured automatically. The configuration file can be o
 argo::mon::arc:local_ini: puppet:///path/to/local_ini/file
 ```
 
+#### gfal setting for nagios-plugins-storage
+
+It is possible to override the `/etc/gfal2.d/http_plugin.conf` setting by setting up your own configuration file. Otherwise, the module will default to file `files/mon/gfal/http_plugin.conf`.
+
 #### EGI
 
-In case you wish to have both condor and ARC-CE probes set up, you can simply use:
+In case you wish to have both gfal setting, condor, and ARC-CE probes set up, you can simply use:
 
 ```yaml
 argo::mon::egi: true

files/mon/gfal/http_plugin.conf

@@ -0,0 +1,74 @@
+# Configuration file for HTTP plugin
+[HTTP PLUGIN]
+
+# Enable HTTP Third Party Copies
+ENABLE_REMOTE_COPY=true
+
+# Enable streamed copies (data passes via the client)
+ENABLE_STREAM_COPY=true
+
+# Enable TPC fallback mechanism
+# Start with DEFAULT_COPY_MODE and fallback in case of error
+ENABLE_FALLBACK_TPC_COPY=true
+
+## Default mode for http copy
+## possible values are: 3rd pull, 3rd push or streamed
+## By default all methods will be tried in case of failures starting from 3rd pull
+## if 3rd push is set as default only 3rd push and then streamed will be executed
+## if streamed is set as default only streamed transfer will be executed
+DEFAULT_COPY_MODE=3rd pull
+
+# Enable or disable the SSL CA check
+INSECURE=false
+
+# Enable or disable Davix Metalink support
+METALINK=false
+
+## Force Davix log level (0 - 5)
+## Level 0 --> No explicit Davix log level. Applies Gfal2 verbosity to Davix as well
+## Level 1 --> Critical messages only
+## Level 2 --> Warning messages and higher
+## Level 3 --> Verbose, but still reasonable
+## Level 4 --> Debug (most of the logging data)
+## Level 5 --> Trace (dump of almost everything)
+## Recommended setting should be 0 or 3. For debugging, use level 4
+LOG_LEVEL=0
+
+# Enable Davix logging of sensitive information
+LOG_SENSITIVE=false
+
+# Enable Davix logging of HTTP request/response body (default false)
+# Note: Meant for debugging
+# - Do not use in production, risk of leaking secrets
+# - Do not use for transfers, as logging will have same file as transferred file
+LOG_CONTENT=false
+
+# Use HTTP Keep-Alive
+KEEP_ALIVE=true
+
+# Attempt to retrieve SE-issued tokens
+RETRIEVE_BEARER_TOKEN=false
+
+# AWS S3 related options
+[S3]
+
+## AWS Secret key
+#SECRET_KEY=
+
+## AWS Access key
+#ACCESS_KEY=
+
+## AWS Short lived token
+#TOKEN=
+
+## AWS Region
+#REGION=
+
+# GCloud related options
+[GCLOUD]
+
+## Google JSON auth file path
+#JSON_AUTH_FILE=
+
+## Google JSON auth content as string
+#JSON_AUTH_STRING=

manifests/mon.pp

@@ -11,17 +11,12 @@
   $disable_ipv6  = false,
 ) {
   include yum::repo::argo
+  include ::yum::repo::igtf
 
   if ($disable_ipv6) {
     include argo::mon::disable_ipv6
   }
 
-  if ($egi) {
-    include ::yum::repo::umd4
-  } else {
-    include ::yum::repo::igtf
-  }
-
   if ($sensu) {
     include argo::mon::sensu
   } else {
@@ -52,6 +47,7 @@
   if ($egi) {
     include argo::mon::condor
     include argo::mon::arc
+    include argo::mon::gfal
   }
   if ($eudat) {
     include argo::mon::eudat

manifests/mon/gfal.pp

@@ -0,0 +1,19 @@
+class argo::mon::gfal (
+  $config="puppet:///modules/argo/mon/gfal/http_plugin.conf"
+) {
+
+  File {
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => '0644',
+  }
+
+  package { 'gfal2-plugin-http': 
+  }
+
+  file { '/etc/gfal2.d/http_plugin.conf':
+    source  => $config,
+    require => Package['gfal2-plugin-http']
+  }
+}