Skip to content

Commit 022a3e4

Browse files
authored
Merge branch 'staging' into STAC-24067-document-monitors-metric-bindings
2 parents 44bafad + dd69703 commit 022a3e4

File tree

47 files changed

+1697
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1697
-187
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
url = https://github.com/susedoc/dsc-style-bundle.git
44
[submodule "product-docs-common"]
55
path = product-docs-common
6-
url = git@github.com:rancher/product-docs-common.git
6+
url = https://github.com/rancher/product-docs-common.git

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ checkmake:
3434

3535
.PHONY: preview
3636
preview:
37-
npx http-server build/site -c-1
37+
npx http-server build/remote-site -c-1

README.adoc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,21 @@ To work locally:
1010
* `make environment`
1111
* `make local`
1212
* `make preview # Start a local http server. Or skip and just load build/site/index.html into a browser.`
13+
14+
== Feature flag toggle for content visibility in production documentation
15+
16+
*Attribute location*: `ss-local-playbook.yml`
17+
*Attribute defined*: `ss-ff: true`
18+
19+
Introduced in the `ss-local-playbook.yml` file, `ss-ff: true` ('ss' is stackstate & 'ff' is feature flag) hides the content encased in the condition in production docs but always displays the content in the netlify preview for review purposes.
20+
21+
For example, to hide a doc section titled 'User management' in production, set the attribute as `ss-ff-user-manage-url: true` in the ss-local-playbook.yml file.
22+
23+
The content to be hidden is encased within the `ifdef` function as follows:
24+
25+
ifdef::ss-ff[]
26+
27+
[content block]
28+
29+
endif::ss-ff[]
30+

docs/latest/antora.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@ title: SUSE Observability
33
version: latest
44
display_version: Latest
55
start_page: en:classic.adoc
6+
asciidoc:
7+
attributes:
8+
stackpacks2_enabled: false
9+
dashboards_enabled: false
610
nav:
7-
- modules/en/nav.adoc
11+
- modules/en/nav.adoc

docs/latest/modules/en/attachments/suse-observability_logs_collector.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ EOF
252252
}
253253
EOF
254254
ts=$(jq -r '.hits.hits[-1].sort[0]' $TEMP)
255-
if [ "$ts" != "null" ]; then
255+
if [ "$ts" != "null" ] && [ "$ts" != "" ]; then
256256
from=$(($ts / 1000000))
257257
else
258258
from=""
-15.1 KB
Loading
-16.1 KB
Loading
15.7 KB
Loading
50.5 KB
Loading
36.7 KB
Loading

0 commit comments

Comments
 (0)