diff --git a/.changelog/11654.txt b/.changelog/11654.txt new file mode 100644 index 0000000000..6a88f2c5dc --- /dev/null +++ b/.changelog/11654.txt @@ -0,0 +1,3 @@ +```release-note:feature +ui: Include `Service.Partition` into available variables for `dashboard_url_templates` +``` diff --git a/ui/packages/consul-ui/app/templates/dc/services/show.hbs b/ui/packages/consul-ui/app/templates/dc/services/show.hbs index 4ead68d924..4817b0984b 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/show.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/show.hbs @@ -193,6 +193,7 @@ as |items item dc|}} Service=(hash Name=item.Service.Service Namespace=(or item.Service.Namespace '') + Partition=(or item.Service.Partition '') ) ) }} diff --git a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs index 105f122aeb..a8df87e411 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/show/topology.hbs @@ -109,6 +109,7 @@ as |nspace dc items topology|}} Service=(hash Name=items.firstObject.Name Namespace=(or items.firstObject.Namespace '') + Partition=(or items.firstObject.Partition '') ) ) }} diff --git a/website/content/docs/agent/options.mdx b/website/content/docs/agent/options.mdx index 12d16e5b42..0d509dce3e 100644 --- a/website/content/docs/agent/options.mdx +++ b/website/content/docs/agent/options.mdx @@ -231,7 +231,7 @@ The options below are all specified on the command-line. Like [`enable_script_checks`](#_enable_script_checks), but only enable them when they are defined in the local configuration files. Script checks defined in HTTP API registrations will still not be allowed. - + - `-encrypt` ((#\_encrypt)) - Specifies the secret key to use for encryption of Consul network traffic. This key must be 32-bytes that are Base64-encoded. The @@ -2191,6 +2191,8 @@ bind_addr = "{{ GetPrivateInterfaces | include \"network\" \"10.0.0.0/8\" | attr - `{{Service.Name}}` - Replaced with the current service's name. - `{{Service.Namespace}}` - Replaced with the current service's namespace or empty if namespaces are not enabled. + - `{{Service.Partition}}` - Replaced with the current service's admin + partition or empty if admin partitions are not enabled. - `{{Datacenter}}` - Replaced with the current service's datacenter. - `ui_dir` - **This field is deprecated in Consul 1.9.0. See the [`ui_config.dir`](#ui_config_dir) field instead.** diff --git a/website/content/docs/connect/observability/ui-visualization.mdx b/website/content/docs/connect/observability/ui-visualization.mdx index d7f25ca1a4..e21631a482 100644 --- a/website/content/docs/connect/observability/ui-visualization.mdx +++ b/website/content/docs/connect/observability/ui-visualization.mdx @@ -104,7 +104,8 @@ ui_config { dashboard_url_templates { service = "https://grafana.example.com/d/lDlaj-NGz/ service-overview?orgId=1&var-service={{Service.Name}}& - var-namespace={{Service.Namespace}}&var-dc={{Datacenter}}" + var-namespace={{Service.Namespace}}& + var-partition={{Service.Partition}}&var-dc={{Datacenter}}" } } ```