Change default sslMode to "prefer" (#2)

Netcracker · Jan 13, 2025 · d9cbeb5 · d9cbeb5
1 parent 370d84e
commit d9cbeb5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -26,7 +26,7 @@ jobs:
           - name: pgskipper-monitoring-agent
             file: Dockerfile
             context: ""
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Validate
         run: |

diff --git a/.github/workflows/clean.yaml b/.github/workflows/clean.yaml
@@ -8,7 +8,7 @@ env:
 jobs:
   delete:
     if: github.event.ref_type == 'branch'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Prepare Tag
         run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.22.5-alpine3.20 as builder
+FROM --platform=$BUILDPLATFORM golang:1.22.5-alpine3.20 AS builder
 
 ENV GO111MODULE=on
 
@@ -12,8 +12,8 @@ RUN go mod tidy
 # Build
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o ./_output/bin/metrics ./collector/main.go
 
-FROM alpine:3.20 as base
-COPY --from=builder --chown=${USER_UID} /workspace/_output/bin/metrics /monitor/
+FROM alpine:3.20 AS base
+COPY --from=builder /workspace/_output/bin/metrics /monitor/
 
 RUN apk add --upgrade --no-cache curl
 

diff --git a/collector/pkg/metrics/ura_collector.go b/collector/pkg/metrics/ura_collector.go
@@ -172,7 +172,7 @@ func handleSourceOfMetric(s *Scraper, parameters map[string]interface{}, paramTy
 }
 
 func parseSSLMode(url string) string {
-	if util.GetEnv("PGSSLMODE", "disable") == "require" {
+	if util.GetEnv("PGSSLMODE", "prefer") == "require" {
 		return strings.Replace(url, "http", "https", -1)
 	}
 	return url

diff --git a/collector/pkg/postgres/client.go b/collector/pkg/postgres/client.go
@@ -34,7 +34,7 @@ var (
 	PgUser     = util.GetEnv("MONITORING_USER", "monitoring_role")
 	PgPass     = util.GetEnv("MONITORING_PASSWORD", "monitoring_password")
 	PgDatabase = util.GetEnv("POSTGRES_DATABASE", "postgres")
-	PgSsl      = util.GetEnv("PGSSLMODE", "disable")
+	PgSsl      = util.GetEnv("PGSSLMODE", "prefer")
 )
 
 type Row map[string]interface{}
@@ -57,7 +57,7 @@ func NewConnector() *PostgresConnector {
 func NewConnectorForUser(host string, port int, user, pass string) *PostgresConnector {
 
 	ssl := false
-	if PgSsl != "disable" {
+	if PgSsl == "require" {
 		ssl = true
 	}