Update IPA to use getcert instead of ipa-getcert, as it includes more certificates.

config.go

@@ -37,7 +37,7 @@ type Config struct {
 	HTTPDPKIProxyConf  string `fig:"httpd_pki_proxy_conf"`
 	KInitBin           string `fig:"kinit_bin"`
 	KListBin           string `fig:"klist_bin"`
-	IPAGetCertBIN      string `fig:"ipa_getcert_bin"`
+	GetCertBIN         string `fig:"getcert_bin"`
 }
 
 const (
@@ -167,7 +167,7 @@ func (a *App) ReadConfig() {
 		HTTPDPKIProxyConf:  "/etc/httpd/conf.d/ipa-pki-proxy.conf",
 		KInitBin:           "/usr/bin/kinit",
 		KListBin:           "/usr/bin/klist",
-		IPAGetCertBIN:      "/usr/bin/ipa-getcert",
+		GetCertBIN:         "/usr/bin/getcert",
 	}
 
 	// Load configuration.

freeipa.go

@@ -200,8 +200,8 @@ func (e *FreeIPAExporter) certMongerCerts() ([]*CertMongerCerts, error) {
 		requestRX := regexp.MustCompile(`Request ID '([A-Za-z0-9]+)':`)
 		keyValueRX := regexp.MustCompile(`\s([A-Za-z][A-Za-z- ]+): (.*)$`)
 
-		// Setup the ipa-getcert list command.
+		// Setup the getcert list command.
-		cmd := exec.Command(app.config.IPAGetCertBIN, "list")
+		cmd := exec.Command(app.config.GetCertBIN, "list")
 
 		// Get the pipes.
 		stdout, err := cmd.StdoutPipe()

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/antchfx/xmlquery v1.3.17
 	github.com/go-ldap/ldap/v3 v3.4.5
 	github.com/gorilla/handlers v1.5.1
-	github.com/grmrgecko/go-freeipa v0.0.0-20230814003934-9662b716120c
+	github.com/grmrgecko/go-freeipa v0.0.0-20240308202417-98de29c2fd81
 	github.com/grmrgecko/go-unixaccounts v0.0.0-20230814023229-86c46cf9fa3b
 	github.com/influxdata/influxdb-client-go/v2 v2.12.3
 	github.com/influxdata/line-protocol/v2 v2.2.1

go.sum

@@ -54,8 +54,8 @@ github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyC
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/grmrgecko/go-freeipa v0.0.0-20230814003934-9662b716120c h1:i35K9mKZNYjj8A0kA/tMj0hh+Ms1V9O6x8MsYSb1Dvs=
+github.com/grmrgecko/go-freeipa v0.0.0-20240308202417-98de29c2fd81 h1:22FQHx44AyR5vLybmjl5FuDu/Xj+jHZSZLaMPJvboNk=
-github.com/grmrgecko/go-freeipa v0.0.0-20230814003934-9662b716120c/go.mod h1:bg9+b0lCJ2+XwgNfDOCG4gjMwsHH/nwTTKaYF/T3o/Q=
+github.com/grmrgecko/go-freeipa v0.0.0-20240308202417-98de29c2fd81/go.mod h1:bg9+b0lCJ2+XwgNfDOCG4gjMwsHH/nwTTKaYF/T3o/Q=
 github.com/grmrgecko/go-unixaccounts v0.0.0-20230814023229-86c46cf9fa3b h1:4twMmYqPkuqUobzM7GkHECiEu6SuH06xgKgHRiviZ2U=
 github.com/grmrgecko/go-unixaccounts v0.0.0-20230814023229-86c46cf9fa3b/go.mod h1:ND6FYE0L6uFGxbi3A+pVpb9doB5mAUiFHjfYEDpHIHI=
 github.com/hashicorp/go-hclog v1.4.0 h1:ctuWFGrhFha8BnnzxqeRGidlEcQkDyL5u8J8t5eA11I=

main.go

@@ -15,7 +15,7 @@ import (
 const (
 	serviceName        = "freeipa-health-metrics"
 	serviceDescription = "Provides metrics of FreeIPA's health"
-	serviceVersion     = "0.1"
+	serviceVersion     = "0.4"
 	namespace          = "freeipa"
 )
 

test/test_config.yaml

@@ -27,4 +27,4 @@ pki_tomcat_server_xml: test/server.xml
 httpd_pki_proxy_conf: test/ipa-pki-proxy.conf
 kinit_bin: test/kinit
 klist_bin: test/klist
-ipa_getcert_bin: test/ipa-getcert
+getcert_bin: test/getcert