Merge branch 'main' into colin/pd-metrics

coadler · coadler · commit ee10a502f09f · 2022-11-04T17:03:24.000-05:00
diff --git a/cli/server.go b/cli/server.go
@@ -516,16 +516,14 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
 				}
 				defer closeUsersFunc()
 
-				closeWorkspacesFunc, err := prometheusmetrics.Workspaces(ctx, options.PrometheusRegistry, options.Database, 0)
+				closeWorkspacesFunc, err := prometheusmetrics.Workspaces(ctx, options.PrometheusRegisterer, options.Database, 0)
 				if err != nil {
 					return xerrors.Errorf("register workspaces prometheus metric: %w", err)
 				}
 				defer closeWorkspacesFunc()
 
 				//nolint:revive
-				defer serveHandler(ctx, logger, promhttp.InstrumentMetricHandler(
-					options.PrometheusRegistry, promhttp.HandlerFor(options.PrometheusRegistry, promhttp.HandlerOpts{}),
-				), cfg.Prometheus.Address.Value, "prometheus")()
+				defer serveHandler(ctx, logger, promhttp.Handler(), cfg.Prometheus.Address.Value, "prometheus")()
 			}
 
 			// We use a separate coderAPICloser so the Enterprise API
diff --git a/docs/install/database.md b/docs/install/database.md
@@ -0,0 +1,88 @@
+## Recommendation
+
+For production deployments, we recommend using an external [PostgreSQL](https://www.postgresql.org/) database (version 13 or higher).
+
+## Basic configuration
+
+Before starting the Coder server, prepare the database server by creating a role and a database.
+Remember that the role must have access to the created database.
+
+With `psql`:
+
+```sql
+CREATE ROLE coder LOGIN SUPERUSER PASSWORD 'secret42';
+```
+
+With `psql -U coder`:
+
+```sql
+CREATE DATABASE coder;
+```
+
+Coder configuration is defined via [environment variables](../admin/configure.md).
+The database client requires the connection string provided via the `CODER_PG_CONNECTION_URL` variable.
+
+```sh
+export CODER_PG_CONNECTION_URL="postgres://coder:secret42@localhost/coder?sslmode=disable"
+```
+
+## Custom schema
+
+For installations with elevated security requirements, it's advised to use a separate [schema](https://www.postgresql.org/docs/current/ddl-schemas.html) instead of the public one.
+
+With `psql -U coder`:
+
+```sql
+CREATE SCHEMA myschema;
+```
+
+Once the schema is created, you can list all schemas with `\dn`:
+
+```
+     List of schemas
+     Name  |  Owner
+-----------+----------
+ myschema  | coder
+ public    | postgres
+(2 rows)
+```
+
+In this case the database client requires the modified connection string:
+
+```sh
+export CODER_PG_CONNECTION_URL="postgres://coder:secret42@localhost/coder?sslmode=disable&search_path=myschema"
+```
+
+The `search_path` parameter determines the order of schemas in which they are visited while looking for a specific table.
+The first schema named in the search path is called the current schema. By default `search_path` defines the following schemas:
+
+```sql
+SHOW search_path;
+
+search_path
+--------------
+ "$user", public
+```
+
+Using the `search_path` in the connection string corresponds to the following `psql` command:
+
+```sql
+ALTER ROLE coder SET search_path = myschema;
+```
+
+## Troubleshooting
+
+### Coder server fails startup with "current_schema: converting NULL to string is unsupported"
+
+Please make sure that the schema selected in the connection string `...&search_path=myschema` exists
+and the role has granted permissions to access it. The schema should be present on this listing:
+
+```sh
+psql -U coder -c '\dn'
+```
+
+## Next steps
+
+- [Quickstart](../quickstart.md)
+- [Configuring Coder](../admin/configure.md)
+- [Templates](../templates.md)
diff --git a/docs/manifest.json b/docs/manifest.json
@@ -55,6 +55,11 @@
           "description": "Run Coder in offline / air-gapped environments",
           "path": "./install/offline.md"
         },
+        {
+          "title": "External database",
+          "description": "Use external PostgreSQL database",
+          "path": "./install/database.md"
+        },
         {
           "title": "Uninstall",
           "description": "Learn how to uninstall Coder",

Original file line number	Diff line number	Diff line change
`@@ -516,16 +516,14 @@ func Server(vip viper.Viper, newAPI func(context.Context, coderd.Options) (*co`
`516`	`516`	`}`
`517`	`517`	`defer closeUsersFunc()`
`518`	`518`
`519`		`- closeWorkspacesFunc, err := prometheusmetrics.Workspaces(ctx, options.PrometheusRegistry, options.Database, 0)`
	`519`	`+ closeWorkspacesFunc, err := prometheusmetrics.Workspaces(ctx, options.PrometheusRegisterer, options.Database, 0)`
`520`	`520`	`if err != nil {`
`521`	`521`	`return xerrors.Errorf("register workspaces prometheus metric: %w", err)`
`522`	`522`	`}`
`523`	`523`	`defer closeWorkspacesFunc()`
`524`	`524`
`525`	`525`	`//nolint:revive`
`526`		`- defer serveHandler(ctx, logger, promhttp.InstrumentMetricHandler(`
`527`		`- options.PrometheusRegistry, promhttp.HandlerFor(options.PrometheusRegistry, promhttp.HandlerOpts{}),`
`528`		`- ), cfg.Prometheus.Address.Value, "prometheus")()`
	`526`	`+ defer serveHandler(ctx, logger, promhttp.Handler(), cfg.Prometheus.Address.Value, "prometheus")()`
`529`	`527`	`}`
`530`	`528`
`531`	`529`	`// We use a separate coderAPICloser so the Enterprise API`