From d4495ddb7c58f8c8765a745128bc2a1bcc1c4d3c Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 2 Nov 2020 11:11:57 -0800 Subject: [PATCH 1/3] Update current version for 7.10 --- conf.yaml | 2 +- shared/versions/stack/7.10.asciidoc | 2 +- shared/versions/stack/current.asciidoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf.yaml b/conf.yaml index 10bd940ebf1f0..7031087b84c25 100644 --- a/conf.yaml +++ b/conf.yaml @@ -54,7 +54,7 @@ contents: sections: - title: Installation and Upgrade Guide prefix: en/elastic-stack - current: &stackcurrent 7.9 + current: &stackcurrent 7.10 index: docs/en/install-upgrade/index.asciidoc branches: [ master, 7.x, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0 ] live: &stacklive [ master, 7.x, 7.10, 7.9, 6.8 ] diff --git a/shared/versions/stack/7.10.asciidoc b/shared/versions/stack/7.10.asciidoc index 2dea00a6614ca..cfd94a9183f26 100644 --- a/shared/versions/stack/7.10.asciidoc +++ b/shared/versions/stack/7.10.asciidoc @@ -18,7 +18,7 @@ bare_version never includes -alpha or -beta release-state can be: released | prerelease | unreleased ////////// -:release-state: unreleased +:release-state: released //// APM Agent versions diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc index 7051e45f74463..5f9e968d40882 100644 --- a/shared/versions/stack/current.asciidoc +++ b/shared/versions/stack/current.asciidoc @@ -1 +1 @@ -include::7.9.asciidoc[] +include::7.10.asciidoc[] From e43720d26c71fd5a8302d8d249b39f5b349d9146 Mon Sep 17 00:00:00 2001 From: Eamonn Smith Date: Mon, 19 Oct 2020 14:34:28 +0100 Subject: [PATCH 2/3] Move content to legacy docs --- conf.yaml | 119 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 57 deletions(-) diff --git a/conf.yaml b/conf.yaml index 7031087b84c25..2cc03bcdab189 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1141,63 +1141,7 @@ contents: repo: apm-agent-rum-js path: CHANGELOG.asciidoc exclude_branches: [ 3.x, 2.x, 1.x, 0.x ] - - title: Logs Monitoring Guide - prefix: en/logs/guide - current: *stackcurrent - branches: [ master, 7.x, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5 ] - live: *stacklive - index: docs/en/logs/index.asciidoc - chunk: 1 - tags: Logs/Guide - subject: Logs - sources: - - - repo: observability-docs - path: docs/en - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc - - title: Metrics Monitoring Guide - prefix: en/metrics/guide - current: *stackcurrent - branches: [ master, 7.x, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5 ] - live: *stacklive - index: docs/en/metrics/index.asciidoc - chunk: 1 - tags: Metrics/Guide - subject: Metrics - sources: - - - repo: observability-docs - path: docs/en - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc - - title: Uptime Monitoring Guide - prefix: en/uptime - current: *stackcurrent - branches: [ master, 7.x, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2 ] - live: *stacklive - index: docs/en/uptime/index.asciidoc - chunk: 1 - tags: Uptime/Guide - subject: Uptime - sources: - - - repo: observability-docs - path: docs/en - - - repo: docs - path: shared/versions/stack/{version}.asciidoc - - - repo: docs - path: shared/attributes.asciidoc + - title: Elastic Security sections: @@ -1243,6 +1187,7 @@ contents: repo: docs path: shared/attributes.asciidoc + - title: "Logstash: Collect, Enrich, and Transport" sections: - title: Logstash Reference @@ -1997,6 +1942,66 @@ contents: - repo: docs path: shared/attributes.asciidoc + - title: Logs Monitoring Guide for 7.5-7.9 + prefix: en/logs/guide + current: 7.9 + branches: [ 7.9, 7.8, 7.7, 7.6, 7.5 ] + live: *stacklive + index: docs/en/logs/index.asciidoc + chunk: 1 + private: 1 + tags: Logs/Guide + subject: Logs + sources: + - + repo: observability-docs + path: docs/en + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + - title: Metrics Monitoring Guide for 7.5-7.9 + prefix: en/metrics/guide + current: 7.9 + branches: [ 7.9, 7.8, 7.7, 7.6, 7.5 ] + live: *stacklive + index: docs/en/metrics/index.asciidoc + chunk: 1 + private: 1 + tags: Metrics/Guide + subject: Metrics + sources: + - + repo: observability-docs + path: docs/en + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc + - title: Uptime Monitoring Guide for 7.2-7.9 + prefix: en/uptime + current: 7.9 + branches: [ 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2 ] + live: *stacklive + index: docs/en/uptime/index.asciidoc + chunk: 1 + private: 1 + tags: Uptime/Guide + subject: Uptime + sources: + - + repo: observability-docs + path: docs/en + - + repo: docs + path: shared/versions/stack/{version}.asciidoc + - + repo: docs + path: shared/attributes.asciidoc - title: Infrastructure Monitoring Guide for 6.5-7.4 prefix: en/infrastructure/guide current: 7.4 From 8db424d0126aa1fea6644b187ad44bc24f9bf05d Mon Sep 17 00:00:00 2001 From: Eamonn Smith Date: Mon, 19 Oct 2020 15:22:00 +0100 Subject: [PATCH 3/3] Remove live attribute --- conf.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf.yaml b/conf.yaml index 2cc03bcdab189..4594be692b2c2 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1946,7 +1946,6 @@ contents: prefix: en/logs/guide current: 7.9 branches: [ 7.9, 7.8, 7.7, 7.6, 7.5 ] - live: *stacklive index: docs/en/logs/index.asciidoc chunk: 1 private: 1 @@ -1966,7 +1965,6 @@ contents: prefix: en/metrics/guide current: 7.9 branches: [ 7.9, 7.8, 7.7, 7.6, 7.5 ] - live: *stacklive index: docs/en/metrics/index.asciidoc chunk: 1 private: 1 @@ -1986,7 +1984,6 @@ contents: prefix: en/uptime current: 7.9 branches: [ 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2 ] - live: *stacklive index: docs/en/uptime/index.asciidoc chunk: 1 private: 1