Merge pull request #1165 from OpenLiberty/staging

Merge staging to prod - Add two new microprofile-telemetry-grafana guides

Author: shin19991207

.github/workflows/drafts-to-test-java17.json

@@ -1,4 +1,2 @@
 [
-  "draft-guide-microprofile-telemetry-grafana-automatic",
-  "draft-guide-microprofile-telemetry-grafana-custom"
 ]

.github/workflows/drafts-to-test.json

@@ -1,5 +1,3 @@
 [
-  "draft-guide-microprofile-telemetry-grafana-automatic",
-  "draft-guide-microprofile-telemetry-grafana-custom",
   "draft-guide-jakarta-concurrency"
 ]

.github/workflows/guides-java17.json

@@ -4,6 +4,8 @@
   "guide-jakarta-websocket",
   "guide-jms-intro",
   "guide-liberty-deep-dive",
-  "guide-liberty-deep-dive-gradle"
+  "guide-liberty-deep-dive-gradle",
+  "guide-microprofile-telemetry-grafana-automatic",
+  "guide-microprofile-telemetry-grafana-custom"
 ]
 

guide_categories.json

@@ -30,7 +30,7 @@
             },
             {
                 "subcategory_name": "Observability",
-                "guides": ["microprofile-metrics", "microprofile-telemetry-jaeger", "microprofile-health", "kubernetes-microprofile-health", "microprofile-opentracing", "microprofile-opentracing-jaeger"]
+                "guides": ["microprofile-metrics", "microprofile-health", "kubernetes-microprofile-health", "microprofile-telemetry-grafana-automatic", "microprofile-telemetry-grafana-custom", "microprofile-telemetry-jaeger", "microprofile-opentracing", "microprofile-opentracing-jaeger"]
             },
             {
                 "subcategory_name": "Security",

guide_prereqs.json

@@ -4,12 +4,12 @@
             "name": "Java SDK",
             "link": "https://developer.ibm.com/languages/java/semeru-runtimes/downloads",
             "guides": ["*"], 
-            "exclude": ["contract-testing", "jakarta-faces", "jakarta-websocket", "jms-intro", "jpa-intro", "spring-boot"]
+            "exclude": ["contract-testing", "jakarta-faces", "jakarta-websocket", "jms-intro", "jpa-intro", "microprofile-telemetry-grafana-automatic", "microprofile-telemetry-grafana-custom", "spring-boot"]
         },
         {
             "name": "Java SDK 17",
             "link": "https://developer.ibm.com/languages/java/semeru-runtimes/downloads",
-            "guides": ["contract-testing", "jakarta-faces", "jakarta-websocket", "jms-intro"]
+            "guides": ["contract-testing", "jakarta-faces", "jakarta-websocket", "jms-intro", "microprofile-telemetry-grafana-automatic", "microprofile-telemetry-grafana-custom"]
         },
         {
             "name": "Java SDK 21",

guide_tags.json

@@ -18,8 +18,9 @@
             "additional_search_terms": ["Micro Profile", "MP"],
             "guides": ["cdi-intro", "kubernetes-microprofile-config", "kubernetes-microprofile-health", "microprofile-config", "microprofile-config-profile",
                 "microprofile-fallback", "microprofile-health", "microprofile-istio-retry-fallback", "microprofile-jwt", 
-                "microprofile-metrics", "microprofile-openapi", "microprofile-telemetry-jaeger", "microprofile-opentracing", "microprofile-opentracing-jaeger", "microprofile-rest-client", 
-                "microprofile-rest-client-async", "microshed-testing", "rest-client-java", "rest-intro", "bulkhead", 
+                "microprofile-metrics", "microprofile-openapi", "microprofile-telemetry-jaeger", "microprofile-opentracing", "microprofile-opentracing-jaeger",
+                "microprofile-telemetry-grafana-automatic", "microprofile-telemetry-grafana-custom",
+                "microprofile-rest-client", "microprofile-rest-client-async", "microshed-testing", "rest-client-java", "rest-intro", "bulkhead",
                 "circuit-breaker", "microprofile-config-intro", "retry-timeout", 
                 "microprofile-reactive-messaging", "reactive-service-testing", "microprofile-reactive-messaging-rest-integration", "microprofile-reactive-messaging-acknowledgment",
                 "reactive-messaging-sse", "mongodb-intro", "microprofile-graphql", "testcontainers"],
@@ -79,11 +80,11 @@
         },
         {
             "name": "telemetry",
-            "guides": ["microprofile-telemetry-jaeger"]
+            "guides": ["microprofile-telemetry-jaeger", "microprofile-telemetry-grafana-automatic", "microprofile-telemetry-grafana-custom"]
         },
         {
             "name": "@withspan",
-            "guides": ["microprofile-telemetry-jaeger"]
+            "guides": ["microprofile-telemetry-jaeger", "microprofile-telemetry-grafana-custom"]
         },
         {
             "name": "testing",