From b585dbf015d099970978c4aa7e3c7d7ef1379a6d Mon Sep 17 00:00:00 2001
From: Paul Wright <5154224+pwright@users.noreply.github.com>
Date: Mon, 13 May 2024 18:30:37 +0100
Subject: [PATCH] update service status (#240)

* update service status
---
 cli/index.adoc             | 19 ++++++++++++++++++-
 troubleshooting/index.adoc | 18 ++++++++++++------
 yaml/annotations.adoc      | 13 +++++++++----
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/cli/index.adoc b/cli/index.adoc
index 4a438ee0..751988ef 100644
--- a/cli/index.adoc
+++ b/cli/index.adoc
@@ -290,9 +290,26 @@ NOTE: You can specify more than one port by repeating this option.
 
 * `--protocol <protocol>` allows you specify the protocol you want to use, `tcp`, `http` or `http2`
 
+NOTE: If you do not specify ports, `skupper` uses the `containerPort` value of the deployment.
 --
 
-NOTE: If you do not specify ports, `skupper` uses the `containerPort` value of the deployment.
+. Check the status of services exposed on the {service-network} (`-v` is only available on Kubernetes):
++
+--
+[source, bash]
+----
+$ skupper service status -v
+Services exposed through Skupper:
+╰─ backend:8080 (tcp)
+   ╰─ Sites:
+      ├─ 4d80f485-52fb-4d84-b10b-326b96e723b2(west)
+      │  policy: disabled
+      ╰─ 316fbe31-299b-490b-9391-7b46507d76f1(east)
+         │ policy: disabled
+         ╰─ Targets:
+            ╰─ backend:8080 name=backend-9d84544df-rbzjx
+----
+
 
 // Type: procedure
 [id="exposing-complex-services"] 
diff --git a/troubleshooting/index.adoc b/troubleshooting/index.adoc
index 7b00260a..297a1007 100644
--- a/troubleshooting/index.adoc
+++ b/troubleshooting/index.adoc
@@ -79,21 +79,27 @@ The output shows:
 * Details for each site, for example the namespace names.
 --
 
-. Check the status of services exposed on the {service-network}:
+. Check the status of services exposed on the {service-network} (`-v` is only available on Kubernetes):
 +
 --
 [source, bash]
 ----
-$ skupper service status
+$ skupper service status -v
 Services exposed through Skupper:
-╰─ backend (tcp port 8080)
-   ╰─ Targets:
-      ╰─ app=backend name=backend
+╰─ backend:8080 (tcp)
+   ╰─ Sites:
+      ├─ 4d80f485-52fb-4d84-b10b-326b96e723b2(west)
+      │  policy: disabled
+      ╰─ 316fbe31-299b-490b-9391-7b46507d76f1(east)
+         │ policy: disabled
+         ╰─ Targets:
+            ╰─ backend:8080 name=backend-9d84544df-rbzjx
 ----
 
 The output shows the `backend` service and the related target of that service.
 
-NOTE: The related targets for services are only displayed when the target is available on the current cluster.
+NOTE: As part of output each site reports the status of the policy system on that cluster.
+
 --
 
 . List the Skupper events for a site:
diff --git a/yaml/annotations.adoc b/yaml/annotations.adoc
index 89d6f055..58254bb4 100644
--- a/yaml/annotations.adoc
+++ b/yaml/annotations.adoc
@@ -70,11 +70,16 @@ This allows you to delete and recreate the `backend` service without having to a
 
 [source, bash]
 ----
-$ skupper service status
+$ skupper service status -v
 Services exposed through Skupper:
-╰─ backend (tcp port 8080)
-   ╰─ Targets:
-      ╰─ app=hello-world-backend name=hello-world-backend
+╰─ backend:8080 (tcp)
+   ╰─ Sites:
+      ├─ 4d80f485-52fb-4d84-b10b-326b96e723b2(west)
+      │  policy: disabled
+      ╰─ 316fbe31-299b-490b-9391-7b46507d76f1(east)
+         │ policy: disabled
+         ╰─ Targets:
+            ╰─ backend:8080 name=backend-9d84544df-rbzjx
 ----
 
 NOTE: The related targets for services are only displayed when the target is available on the current cluster.