Merge branch 'checkup-no-latest' into 'master'

Do not use "latest" for postgres-checkup + a couple of tweaks of checkup form

See merge request postgres-ai/database-lab!860

Author: NikolayS

ui/packages/platform/src/components/CheckupAgentForm/CheckupAgentForm.tsx

@@ -496,8 +496,9 @@ class CheckupAgentForm extends Component<
                         id="hostName"
                         className={classes.textInput}
                         helperText={
-                          'Hostname(s) or IP address(es) divided ' +
-                          'by `;`, `,`, space or end of string'
+                          'Enter hostnames or IPs, separated by commas, spaces, or line breaks. ' +
+                          'To reach your machine\'s "localhost" from the container, use "host.docker.internal". ' +
+                          'The same approach works when using SSH port forwarding from your machine to a remote host.'
                         }
                         margin="normal"
                         onChange={(e) => {
@@ -552,6 +553,11 @@ class CheckupAgentForm extends Component<
                     variant="outlined"
                     id="databaseUserName"
                     className={classes.textInput}
+                    helperText={
+                      'You can create a new DB user named "pgai_observer", then grant ' +
+                      'the "pg_monitor" role to this user using the following SQL command: ' +
+                      'GRANT pg_monitor TO pgai_observer;'
+                    }
                     margin="normal"
                     onChange={(e) => {
                       this.setState({

ui/packages/platform/src/components/Reports/Reports.tsx

@@ -309,11 +309,11 @@ class Reports extends Component<ReportsWithStylesProps, ReportsState> {
         onClick={() => this.props.history.push('/' + org + '/checkup-config')}
         title={
           this.props.orgPermissions?.checkupReportConfigure
-            ? 'Add Checkup agent to your server'
+            ? 'Start generating new reports for your Postgres servers'
             : messages.noPermission
         }
       >
-        Add agent
+        Generate report
       </ConsoleButtonWrapper>
     )
 

ui/packages/platform/src/utils/cfggen.ts

@@ -129,7 +129,6 @@ cat <<EOF > ${data.projectName}.yml
 ${this.generateCheckupConfig(data)}
 EOF
 
-# Start check health of Postgres databases
 `
 
     if (data.password === 'inputpassword') {
@@ -140,11 +139,19 @@ EOF
 && read -s -p "" DB_PWD \\
 && PGPASSWORD="$\{DB_PWD}" \\
 && `
+    } else {
+      result =
+        result +
+        `# Specify Postgres password
+export DB_PWD=****
+
+`
     }
 
     result =
       result +
-      `docker run \\
+      `# Start check health of Postgres databases
+docker run \\
   -v $(pwd)/${data.projectName}.yml:/${data.projectName}.yml \\
   -v $(pwd)/artifacts:/artifacts \\`
 
@@ -162,7 +169,7 @@ EOF
   -e ${hostsType}="${hosts}" \\
   -e CHECKUP_SNAPSHOT_DISTANCE_SECONDS=${data.collectPeriod} \\
   -e PGPASSWORD="$\{DB_PWD}" \\
-  registry.gitlab.com/postgres-ai/postgres-checkup:latest bash run_checkup.sh
+  registry.gitlab.com/postgres-ai/postgres-checkup:1-5-1 bash run_checkup.sh
 `
 
     return result