diff --git a/_help/faq.md b/_help/faq.md deleted file mode 100644 index 9c4ba1b2a4..0000000000 --- a/_help/faq.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -title: Frequently Asked Questions -overview: Frequently Asked Questions about Istio. - -order: 20 - -layout: help -type: markdown -redirect_from: - - "/faq" - - "/docs/welcome/faq.html" -toc: false ---- -{% include home.html %} - -Here are some frequently asked questions about Istio. - -{% include faq.html - faq_pages = site.faq - faq_category_dirs = 'general,setup,security,mixer,traffic-management' - faq_category_names = 'General,Setup,Security,Mixer,Traffic Management' - %} diff --git a/_help/faq/general.html b/_help/faq/general.html new file mode 100644 index 0000000000..89c5df50d2 --- /dev/null +++ b/_help/faq/general.html @@ -0,0 +1,9 @@ +--- +title: General +overview: General Q&A + +order: 10 + +layout: help +--- +{% include faq.html category='general' %} diff --git a/_help/faq/index.md b/_help/faq/index.md new file mode 100644 index 0000000000..0f1d3e54ac --- /dev/null +++ b/_help/faq/index.md @@ -0,0 +1,50 @@ +--- +title: FAQ +overview: Frequently Asked Questions about Istio. + +order: 20 + +layout: help +type: markdown +toc: false + +redirect_from: + - "/faq" + - "/docs/welcome/faq.html" +--- +{% include home.html %} + +You've got questions? We've got answers! + +
+
+ {% assign category_dirs = 'general,setup,security,mixer,traffic-management' %} + {% assign category_names = 'General,Setup,Security,Mixer,Traffic Management' %} + {% assign category_dirs = category_dirs | split: ',' %} + {% assign category_names = category_names | split: ',' %} + + {% assign faqs = site.faq | sort: "order" %} + + {% for cat in category_dirs %} +
+
+
+ {{category_names[forloop.index0]}} +
+ +
+ {% for q in faqs %} + {% assign comp = q.path | split: '/' %} + {% assign qcat = comp[1] %} + {% if cat == qcat %} + {% assign name = q.path | downcase | split: '/' | last | remove: ".md" %} + + {{q.title}}
+ {% endif %} + {% endfor %} +
+
+
+ {% endfor %} +
+
diff --git a/_help/faq/mixer.html b/_help/faq/mixer.html new file mode 100644 index 0000000000..abbc6e6c42 --- /dev/null +++ b/_help/faq/mixer.html @@ -0,0 +1,9 @@ +--- +title: Mixer +overview: Mixer Q&A + +order: 40 + +layout: help +--- +{% include faq.html category='mixer' %} diff --git a/_help/faq/security.html b/_help/faq/security.html new file mode 100644 index 0000000000..5877129166 --- /dev/null +++ b/_help/faq/security.html @@ -0,0 +1,9 @@ +--- +title: Security +overview: Security Q&A + +order: 30 + +layout: help +--- +{% include faq.html category='security' %} diff --git a/_help/faq/setup.html b/_help/faq/setup.html new file mode 100644 index 0000000000..242be527b0 --- /dev/null +++ b/_help/faq/setup.html @@ -0,0 +1,9 @@ +--- +title: Setup +overview: Setup Q&A + +order: 20 + +layout: help +--- +{% include faq.html category='setup' %} diff --git a/_help/faq/traffic-management.html b/_help/faq/traffic-management.html new file mode 100644 index 0000000000..11ae8c2f98 --- /dev/null +++ b/_help/faq/traffic-management.html @@ -0,0 +1,9 @@ +--- +title: Traffic Management +overview: Traffic Management Q&A + +order: 50 + +layout: help +--- +{% include faq.html category='traffic-management' %} diff --git a/_help/troubleshooting.md b/_help/troubleshooting.md index c2a1335126..b7964a5ef3 100644 --- a/_help/troubleshooting.md +++ b/_help/troubleshooting.md @@ -229,7 +229,7 @@ or [manual]({{home}}/docs/setup/kubernetes/sidecar-injection.html#manual-sidecar Look for errors related to your configuration or your service in the returned logs. -More on viewing Mixer configuration can be found [here]({{home}}/help/faq.html#mixer-self-monitoring) +More on viewing Mixer configuration can be found [here]({{home}}/help/faq/mixer.html#mixer-self-monitoring) ### Verify Mixer is sending metric instances to the Prometheus adapter diff --git a/_includes/faq.html b/_includes/faq.html index 34b972c6ca..ad6ef87415 100644 --- a/_includes/faq.html +++ b/_includes/faq.html @@ -1,68 +1,12 @@ -{% include home.html %} -
-
+{% assign faqs = site.faq | sort: "order" %} +{% for q in faqs %} + {% assign comp = q.path | split: '/' %} + {% assign qcat = comp[1] %} + {% if qcat == include.category %} + {% assign name = q.path | downcase | split: '/' | last | remove: ".md" %} - {% assign category_dirs = include.faq_category_dirs | split: ',' %} - {% assign category_names = include.faq_category_names | split: ',' %} - -
-
- {% assign cats = category_dirs %} - {% for cat in cats %} - {% assign active = "" %} - {% if forloop.index == 1 %} - {% assign active = "active" %} - {% endif %} - - - {{category_names[forloop.index0]}} - - {% endfor %} -
-
- -
-
- - {% assign cats = category_dirs %} - {% for cat in cats %} - {% assign catIndex = forloop.index %} - - {% assign active = "" %} - {% if catIndex == 1 %} - {% assign active = "active" %} - {% endif %} - -
- - {% assign faqs = include.faq_pages | sort: "order" %} - {% for q in faqs %} - {% assign comp = q.path | split: '/' %} - {% assign qcat = comp[1] %} - {% if cat == qcat %} - {% assign name = q.path | downcase | split: '/' | last | remove: ".md" %} - -
-
- -
- {{q.title}} -
- -
- -
-
- {{q.content}} -
-
-
- {% endif %} - {% endfor %} -
- {% endfor %} -
-
-
-
+

Q: {{q.title}}

+ {{q.content}} + {% endif %} +{% endfor %} diff --git a/_includes/footer.html b/_includes/footer.html index 635f405825..aa40408263 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -18,7 +18,7 @@