Commit 3207c9a

committed

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

1 parent be17a32 commit 3207c9aCopy full SHA for 3207c9a

File tree

+20

-7

lines changed

+20

-7

lines changed

Lines changed: 8 additions & 2 deletions

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -309,11 +309,11 @@ class Reports extends Component<ReportsWithStylesProps, ReportsState> {`
`309`	`309`	`onClick={() => this.props.history.push('/' + org + '/checkup-config')}`
`310`	`310`	`title={`
`311`	`311`	`this.props.orgPermissions?.checkupReportConfigure`
`312`		`- ? 'Add Checkup agent to your server'`
	`312`	`+ ? 'Start generating new reports for your Postgres servers'`
`313`	`313`	`: messages.noPermission`
`314`	`314`	`}`
`315`	`315`	`>`
`316`		`- Add agent`
	`316`	`+ Generate report`
`317`	`317`	`</ConsoleButtonWrapper>`
`318`	`318`	`)`
`319`	`319`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ cat <<EOF > ${data.projectName}.yml`
`129`	`129`	`${this.generateCheckupConfig(data)}`
`130`	`130`	`EOF`
`131`	`131`
`132`		`-# Start check health of Postgres databases`
`133`	`132`	`
`134`	`133`
`135`	`134`	`if (data.password === 'inputpassword') {`
`@@ -140,11 +139,19 @@ EOF`
`140`	`139`	`&& read -s -p "" DB_PWD \\`
`141`	`140`	`&& PGPASSWORD="$\{DB_PWD}" \\`
`142`	`141`	&& `
	`142`	`+ } else {`
	`143`	`+ result =`
	`144`	`+ result +`
	`145`	+ `# Specify Postgres password
	`146`	`+export DB_PWD=****`
	`147`	`+`
	`148`	+`
`143`	`149`	`}`
`144`	`150`
`145`	`151`	`result =`
`146`	`152`	`result +`
`147`		- `docker run \\
	`153`	+ `# Start check health of Postgres databases
	`154`	`+docker run \\`
`148`	`155`	`-v $(pwd)/${data.projectName}.yml:/${data.projectName}.yml \\`
`149`	`156`	-v $(pwd)/artifacts:/artifacts \\`
`150`	`157`
`@@ -162,7 +169,7 @@ EOF`
`162`	`169`	`-e ${hostsType}="${hosts}" \\`
`163`	`170`	`-e CHECKUP_SNAPSHOT_DISTANCE_SECONDS=${data.collectPeriod} \\`
`164`	`171`	`-e PGPASSWORD="$\{DB_PWD}" \\`
`165`		`- registry.gitlab.com/postgres-ai/postgres-checkup:latest bash run_checkup.sh`
	`172`	`+ registry.gitlab.com/postgres-ai/postgres-checkup:1-5-1 bash run_checkup.sh`
`166`	`173`	`
`167`	`174`
`168`	`175`	`return result`

Comments

(0)