8000 manage external to steps · coder/coder@388613f · GitHub
[go: up one dir, main page]

Skip to content

Commit 388613f

Browse files
committed
manage external to steps
1 parent 0b489b7 commit 388613f

File tree

1 file changed

+0
-34
lines changed

1 file changed

+0
-34
lines changed

docs/admin/provisioners.md

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -165,20 +165,10 @@ inside the Terraform. See the
165165
[workspace tags documentation](../admin/templates/extending-templates/workspace-tags.md)
166166
for more information.
167167

168-
<<<<<<< HEAD
169168
> [!NOTE]
170169
> Workspace tags defined with the `coder_workspace_tags` data source
171170
> template **do not** automatically apply to the template import job! You may
172171
> need to specify the desired tags when importing the template.
173-
=======
174-
<blockquote class="admonition note">
175-
176-
Workspace tags defined with the `coder_workspace_tags` data source template
177-
**do not** automatically apply to the template import job! You may need to
178-
specify the desired tags when importing the template.
179-
180-
</blockquote>
181-
>>>>>>> c7a48ec08 (replace [!NOTE])
182172

183173
A provisioner can run a given build job if one of the below is true:
184174

@@ -200,7 +190,6 @@ However, it will not pick up any build jobs that do not have either of the
200190
from templates with the tag `scope=user` set, or build jobs from templates in
201191
different organizations.
202192

203-
<<<<<<< HEAD
204193
> [!NOTE]
205194
> If you only run tagged provisioners, you will need to specify a set of
206195
> tags that matches at least one provisioner for _all_ template import jobs and
@@ -209,19 +198,6 @@ different organizations.
209198
> You may wish to run at least one additional provisioner with no additional
210199
> tags so that provisioner jobs with no additional tags defined will be picked
211200
> up instead of potentially remaining in the Pending state indefinitely.
212-
=======
213-
<blockquote class="admonition note">
214-
215-
If you only run tagged provisioners, you will need to specify a set of tags
216-
that matches at least one provisioner for _all_ template import jobs and
217-
workspace build jobs.
218-
219-
You may wish to run at least one additional provisioner with no additional tags
220-
so that provisioner jobs with no additional tags defined will be picked up
221-
instead of potentially remaining in the Pending state indefinitely.
222-
223-
</blockquote>
224-
>>>>>>> c7a48ec08 (replace [!NOTE])
225201

226202
This is illustrated in the below table:
227203

@@ -401,16 +377,6 @@ This can be disabled with a server-wide
401377
coder server --provisioner-daemons=0
402378
```
403379

404-
## Manage external provisioners
405-
406-
You can view more information about and manage your provisioners from the Coder
407-
dashboard.
408-
409-
Under **Admin settings** select **Organizations**, then select **Provisioners**.
410-
411-
Use the **Jobs** or **Daemons** tab to view provisioners and their status, and
412-
delete provisioners as necessary.
413-
414380
## Prometheus metrics
415381

416382
Coder provisioner daemon exports metrics via the HTTP endpoint, which can be

0 commit comments

Comments
 (0)
0