Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui: Update not-defined intention popover and banner #10133

Merged
merged 2 commits into from
Apr 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/10133.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
ui: Updating the wording for the banner and the popover for a service with an upstream that is not explicitly defined.
```
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
{{else if (and item.Intention.Allowed (not item.TransparentProxy) (eq item.Source 'specific-intention'))}}
<TopologyMetrics::Popover
@type='not-defined'
@service={{@service}}
kaxcode marked this conversation as resolved.
Show resolved Hide resolved
@position={{find-by 'id' (concat this.guid item.Namespace item.Name) this.iconPositions}}
@item={{item}}
@oncreate={{action @oncreate item @service}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</:header>
<:body>
<p>
{{t "components.consul.topology-metrics.popover.not-defined.body"}}
{{t "components.consul.topology-metrics.popover.not-defined.body" downstream=@item.Name upstream=@service.Name }}
</p>
</:body>
<:actions as |Actions|>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ topology-metrics:
URL: dc.services.show.intentions
not-defined-intention:
header: Connections are not explicitly defined
body: There appears to be an Intention defining traffic, but the services are unable to communicate until that connection is explicitly defined as a downstream or Transparent Proxy mode is turned on.
body: There appears to be an Intention allowing traffic, but the services are unable to communicate until that connection is enabled by defining an explicit upstream or proxies are set to 'transparent' mode.
footer: Read the documentation
wildcard-intention:
header: Permissive Intention
Expand All @@ -149,5 +149,5 @@ topology-metrics:
notExact: Create
not-defined:
header: No traffic
body: Add the current service as an explicit upstream or turn on Transparent Proxy mode to initiate traffic.
body: Add "{upstream}" as an explicit upstream of "{downstream}" or set the "{downstream}" proxy to "transparent" mode to enable traffic.
kaxcode marked this conversation as resolved.
Show resolved Hide resolved
action: Documentation