Merge branch 'v3' into PMM-11261-update-via-watchtower

.github/workflows/main.yml

@@ -150,7 +150,7 @@ jobs:
 
     steps:
       - name: Slack Notification
-        uses: rtCamp/action-slack-notify@v2
+        uses: rtCamp/action-slack-notify@v2.2.1
 
   workflow_failure:
     if: ${{ failure() }}
@@ -168,4 +168,4 @@ jobs:
 
     steps:
       - name: Slack Notification
-        uses: rtCamp/action-slack-notify@v2
+        uses: rtCamp/action-slack-notify@v2.2.1

.github/workflows/release-doc.yml

@@ -25,7 +25,7 @@ jobs:
           grep -rl '!!! note alert alert-primary' ${{ github.workspace }}-CHANGELOG.txt | xargs --no-run-if-empty sed -i 's/\!\!\! note alert alert-primary "\(.*\)"/\> \:memo\: **\1**/g'
           grep -rl '!!! note alert alert-primary' ${{ github.workspace }}-CHANGELOG.txt | xargs --no-run-if-empty sed -i 's/\!\!\! note alert alert-primary/\> \:memo\: **Note**/g'
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           body_path: ${{ github.workspace }}-CHANGELOG.txt
           draft: true

agent/config/config.go

@@ -18,7 +18,6 @@ package config
 import (
 	"fmt"
 	"io/fs"
-	"log"
 	"net"
 	"net/url"
 	"os"
@@ -414,10 +413,11 @@ func Application(cfg *Config) (*kingpin.Application, *string) {
 	}).Bool()
 
 	app.Flag("version", "Show application version").Short('v').Action(func(*kingpin.ParseContext) error {
+		// We use fmt instead of log package to provide proper output for --json flag.
 		if *jsonF {
-			log.Println(version.FullInfoJSON())
+			fmt.Println(version.FullInfoJSON()) //nolint:forbidigo
 		} else {
-			log.Println(version.FullInfo())
+			fmt.Println(version.FullInfo()) //nolint:forbidigo
 		}
 		os.Exit(0)
 

agent/serviceinfobroker/service_info_broker.go

@@ -237,7 +237,7 @@ func (sib *ServiceInfoBroker) getPostgreSQLInfo(ctx context.Context, dsn string,
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		res.Error = err.Error()
 	}
-	res.PgsmVersion = pgsmVersion
+	res.PgsmVersion = &pgsmVersion
 
 	return &res
 }

agent/serviceinfobroker/service_info_broker_test.go

@@ -260,7 +260,7 @@ func TestServiceInfoBroker(t *testing.T) {
 		}, 0)
 		require.NotNil(t, resp)
 		assert.Equal(t, []string{"postgres", "pmm-agent"}, resp.DatabaseList)
-		assert.Equal(t, "", resp.PgsmVersion)
+		assert.Equal(t, "", *resp.PgsmVersion)
 	})
 
 	t.Run("MongoDBWithSSL", func(t *testing.T) {

api/agentpb/agent.proto

@@ -475,7 +475,7 @@ message ServiceInfoResponse {
   // A list of PostgreSQL databases.
   repeated string database_list = 4;
   // A version of pg_stat_monitor, empty if unavailable.
-  string pgsm_version = 5;
+  optional string pgsm_version = 5;
 }
 
 // JobStatusRequest is a ServerMessage asking pmm-agent for job status.

build/packages/rpm/server/SPECS/grafana.spec

@@ -1,9 +1,9 @@
 %global debug_package   %{nil}
-%global commit          93891204fab2b2be06011638422d3bd9869a1603
+%global commit          f283b87d773da4ad61ca65660e72c084ac8f8716
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 %define build_timestamp %(date -u +"%y%m%d%H%M")
-%define release         103
-%define grafana_version 10.2.3
+%define release         104
+%define grafana_version 10.4.0
 %define full_pmm_version 2.0.0
 %define full_version    v%{grafana_version}-%{full_pmm_version}
 %define rpm_release     %{release}.%{build_timestamp}.%{shortcommit}%{?dist}
@@ -82,6 +82,9 @@ getent passwd pmm >/dev/null || echo "User pmm does not exist. Please create it
 exit 0
 
 %changelog
+* Tue Mar 12 2024 Matej Kubinec <[email protected]> - 10.4.0-1
+- PMM-12991 Grafana 10.4.0
+
 * Tue Jan 16 2024 Matej Kubinec <[email protected]> - 10.2.3-1
 - PMM-12314 Grafana 10.2.3