coder
diff --git a/‎Makefile
Lines changed: 13 additions & 1 deletion b/‎Makefile
Lines changed: 13 additions & 1 deletion
diff --git a/‎docs/admin-old/auth.md
Lines changed: 0 additions & 250 deletions b/‎docs/admin-old/auth.md
Lines changed: 0 additions & 250 deletions
diff --git a/‎docs/admin-old/healthcheck.md b/‎docs/admin-old/healthcheck.md
diff --git a/‎docs/admin-old/users.md
Lines changed: 0 additions & 72 deletions b/‎docs/admin-old/users.md
Lines changed: 0 additions & 72 deletions
diff --git a/‎docs/admin/integrations/prometheus.md
Lines changed: 2 additions & 2 deletions b/‎docs/admin/integrations/prometheus.md
Lines changed: 2 additions & 2 deletions
@@ -487,8 +487,12 @@ gen: \
 	site/src/api/typesGenerated.ts \
 	coderd/rbac/object_gen.go \
 	codersdk/rbacresources_gen.go \
+<<<<<<< HEAD
 	site/src/api/rbacresources_gen.ts \
 	docs/admin/prometheus.md \
+=======
+	docs/admin/integrations/prometheus.md \
+>>>>>>> 0e1703387 (modify prometheus location)
 	docs/reference/cli/README.md \
 	docs/admin/audit-logs.md \
 	coderd/apidoc/swagger.json \
@@ -518,9 +522,13 @@ gen/mark-fresh:
 		$(DB_GEN_FILES) \
 		site/src/api/typesGenerated.ts \
 		coderd/rbac/object_gen.go \
+<<<<<<< HEAD
 		codersdk/rbacresources_gen.go \
 		site/src/api/rbacresources_gen.ts \
 		docs/admin/prometheus.md \
+=======
+		docs/admin/integrations/prometheus.md \
+>>>>>>> 0e1703387 (modify prometheus location)
 		docs/reference/cli/README.md \
 		docs/admin/audit-logs.md \
 		coderd/apidoc/swagger.json \
@@ -624,14 +632,18 @@ coderd/rbac/object_gen.go: scripts/rbacgen/rbacobject.gotmpl scripts/rbacgen/mai
 codersdk/rbacresources_gen.go: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
 	go run scripts/rbacgen/main.go codersdk > codersdk/rbacresources_gen.go
 
+<<<<<<< HEAD
 site/src/api/rbacresources_gen.ts: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
 	go run scripts/rbacgen/main.go typescript > site/src/api/rbacresources_gen.ts
 
 
 docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
+=======
+docs/admin/integrations/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
+>>>>>>> 0e1703387 (modify prometheus location)
 	go run scripts/metricsdocgen/main.go
 	./scripts/pnpm_install.sh
-	pnpm exec prettier --write ./docs/admin/prometheus.md
+	pnpm exec prettier --write ./docs/admin/integrations/prometheus.md
 
 docs/reference/cli/README.md: scripts/clidocgen/main.go examples/examples.gen.json $(GO_SRC_FILES)
 	CI=true BASE_PATH="." go run ./scripts/clidocgen
 
@@ -96,7 +96,7 @@ spec:
 
 ## Available metrics
 
-<!-- Code generated by 'make docs/admin/prometheus.md'. DO NOT EDIT -->
+<!-- Code generated by 'make docs/admin/integrations/prometheus.md'. DO NOT EDIT -->
 
 | Name                                                          | Type      | Description                                                                                                                      | Labels                                                                              |
 | ------------------------------------------------------------- | --------- | -------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
@@ -176,4 +176,4 @@ spec:
 | `promhttp_metric_handler_requests_in_flight`                  | gauge     | Current number of scrapes being served.                                                                                          |                                                                                     |
 | `promhttp_metric_handler_requests_total`                      | counter   | Total number of scrapes by HTTP status code.                                                                                     | `code`                                                                              |
 
-<!-- End generated by 'make docs/admin/prometheus.md'. -->
+<!-- End generated by 'make docs/admin/integrations/prometheus.md'. -->