From 11d86c136e04bc3567f4b598770686e7116cdbf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CShauna=20Diaz=E2=80=9D?= <shdiaz@redhat.com>
Date: Mon, 8 Jan 2024 14:44:10 -0500
Subject: [PATCH] OSDOCS-8805: Adds etcd version query to MicroShift

---
 microshift_support/microshift-etcd.adoc       |  6 ++-
 .../microshift-getting-support.adoc           |  8 ++-
 .../microshift-version.adoc                   |  2 +
 modules/microshift-etcd-version.adoc          | 51 +++++++++++++++++++
 4 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 modules/microshift-etcd-version.adoc

diff --git a/microshift_support/microshift-etcd.adoc b/microshift_support/microshift-etcd.adoc
index 8a7dd91327..4f67708944 100644
--- a/microshift_support/microshift-etcd.adoc
+++ b/microshift_support/microshift-etcd.adoc
@@ -7,8 +7,10 @@ include::_attributes/attributes-microshift.adoc[]
 toc::[]
 
 [role="_abstract"]
-The etcd service is delivered as part of the {product-title} RPM. The etcd service is run as a separate process and the lifecycle is managed automatically by {product-title}.
+The etcd service is delivered as part of the {product-title} RPM. The etcd service is run as a separate process and the etcd lifecycle is managed automatically by {microshift-short}.
 
 include::modules/microshift-observe-debug-etcd-server.adoc[leveloffset=+1]
 
-include::modules/microshift-config-etcd.adoc[leveloffset=+1]
\ No newline at end of file
+include::modules/microshift-config-etcd.adoc[leveloffset=+1]
+
+include::modules/microshift-etcd-version.adoc[leveloffset=+1]
diff --git a/microshift_support/microshift-getting-support.adoc b/microshift_support/microshift-getting-support.adoc
index fbcf1a1be0..fc7bc0b92a 100644
--- a/microshift_support/microshift-getting-support.adoc
+++ b/microshift_support/microshift-getting-support.adoc
@@ -6,10 +6,14 @@ include::_attributes/attributes-microshift.adoc[]
 
 toc::[]
 
-// Getting support; note these modules are OCP
+Use the following information to get more help with {op-system-bundle}, including {product-title} or {op-system-ostree-first}.
 
 include::modules/support.adoc[leveloffset=+1]
+
 include::modules/microshift-provide-feedback-jira-link.adoc[leveloffset=+1]
+
 include::modules/support-knowledgebase-about.adoc[leveloffset=+1]
+
 include::modules/support-knowledgebase-search.adoc[leveloffset=+1]
-include::modules/microshift-submitting-a-case.adoc[leveloffset=+1]
\ No newline at end of file
+
+include::modules/microshift-submitting-a-case.adoc[leveloffset=+1]
diff --git a/microshift_troubleshooting/microshift-version.adoc b/microshift_troubleshooting/microshift-version.adoc
index b3d791ac90..9cd1cbadef 100644
--- a/microshift_troubleshooting/microshift-version.adoc
+++ b/microshift_troubleshooting/microshift-version.adoc
@@ -11,3 +11,5 @@ To begin troubleshooting, determine which version of {product-title} you have in
 include::modules/microshift-version-cli.adoc[leveloffset=+1]
 
 include::modules/microshift-version-api.adoc[leveloffset=+1]
+
+include::modules/microshift-etcd-version.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/modules/microshift-etcd-version.adoc b/modules/microshift-etcd-version.adoc
new file mode 100644
index 0000000000..9e3f7aabd5
--- /dev/null
+++ b/modules/microshift-etcd-version.adoc
@@ -0,0 +1,51 @@
+// Module included in the following assemblies:
+//
+// * microshift_troubleshooting/microshift-version.adoc
+// * microshift_support/microshift-etcd.adoc
+
+:_mod-docs-content-type: PROCEDURE
+[id="microshift-version-etcd_{context}"]
+= Checking the etcd version
+
+You can get the version information for the etcd database included with your {microshift-short}.
+
+.Procedure
+
+* To display the base database version information, run the following command:
++
+[source,terminal]
+----
+$ microshift-etcd version
+----
++
+.Example output
+[source,terminal,subs="attributes+"]
+----
+microshift-etcd Version: 4.15.1
+Base etcd Version: 3.5.10
+----
+
+* To display the full database version information, run the following command:
++
+[source,terminal]
+----
+$ microshift-etcd version -o json
+----
++
+.Example output
+[source,terminal,subs="attributes+"]
+----
+{
+  "major": "4",
+  "minor": "15",
+  "gitVersion": "4.15.1",
+  "gitCommit": "2e182312718cc9d267ec71f37dc2fbe2eed01ee2",
+  "gitTreeState": "clean",
+  "buildDate": "2024-01-09T06:51:40Z",
+  "goVersion": "go1.20.10",
+  "compiler": "gc",
+  "platform": "linux/amd64",
+  "patch": "",
+  "etcdVersion": "3.5.10"
+}
+----
\ No newline at end of file