summaryrefslogtreecommitdiffstats
path: root/docs/generator
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-07-08 20:14:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-07-08 20:14:49 +0000
commit4bf37db76e7dda93e57a9730958c6d467a85c622 (patch)
treee9cdf1b63c1e77c6689994f297dd015b343e4920 /docs/generator
parentReleasing debian version 1.15.0-1. (diff)
downloadnetdata-4bf37db76e7dda93e57a9730958c6d467a85c622.tar.xz
netdata-4bf37db76e7dda93e57a9730958c6d467a85c622.zip
Merging upstream version 1.16.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'docs/generator')
-rwxr-xr-xdocs/generator/buildhtml.sh8
-rwxr-xr-xdocs/generator/buildyaml.sh7
-rwxr-xr-xdocs/generator/checklinks.sh6
-rw-r--r--docs/generator/custom/img/favicon.icobin1150 -> 349 bytes
4 files changed, 11 insertions, 10 deletions
diff --git a/docs/generator/buildhtml.sh b/docs/generator/buildhtml.sh
index 043112242..e1c108fb5 100755
--- a/docs/generator/buildhtml.sh
+++ b/docs/generator/buildhtml.sh
@@ -19,18 +19,18 @@ GO_D_DIR="collectors/go.d.plugin"
rm -rf ${GO_D_DIR}
git clone https://github.com/netdata/go.d.plugin.git ${GO_D_DIR}
-# Copy all netdata .md files to docs/generator/src. Exclude htmldoc itself and also the directory node_modules generatord by Netlify
+# Copy all Netdata .md files to docs/generator/src. Exclude htmldoc itself and also the directory node_modules generatord by Netlify
echo "Copying files"
rm -rf ${SRC_DIR}
find . -type d \( -path ./${GENERATOR_DIR} -o -path ./node_modules \) -prune -o -name "*.md" -print | cpio -pd ${SRC_DIR}
-# Copy netdata html resources
+# Copy Netdata html resources
cp -a ./${GENERATOR_DIR}/custom ./${SRC_DIR}/
# Modify the first line of the main README.md, to enable proper static html generation
echo "Modifying README header"
-sed -i -e '0,/# netdata /s//# Introduction\n\n/' ${SRC_DIR}/README.md
+sed -i -e '0,/# Netdata /s//# Introduction\n\n/' ${SRC_DIR}/README.md
# Remove all GA tracking code
find ${SRC_DIR} -name "*.md" -print0 | xargs -0 sed -i -e 's/\[!\[analytics.*UA-64295674-3)\]()//g'
@@ -81,7 +81,7 @@ prep_html() {
# Build html docs
mkdocs build --config-file="${MKDOCS_CONFIG_FILE}"
- # Fix edit buttons for the markdowns that are not on the main netdata repo
+ # Fix edit buttons for the markdowns that are not on the main Netdata repo
find "${GENERATOR_DIR}/${SITE_DIR}/${GO_D_DIR}" -name "*.html" -print0 | xargs -0 sed -i -e 's/https:\/\/github.com\/netdata\/netdata\/blob\/master\/collectors\/go.d.plugin/https:\/\/github.com\/netdata\/go.d.plugin\/blob\/master/g'
if [ "${lang}" != "en" ] ; then
find "${GENERATOR_DIR}/${SITE_DIR}" -name "*.html" -print0 | xargs -0 sed -i -e 's/https:\/\/github.com\/netdata\/netdata\/blob\/master\/\S*md/https:\/\/github.com\/netdata\/localization\//g'
diff --git a/docs/generator/buildyaml.sh b/docs/generator/buildyaml.sh
index e367ab503..e4a5466a4 100755
--- a/docs/generator/buildyaml.sh
+++ b/docs/generator/buildyaml.sh
@@ -127,6 +127,7 @@ echo -ne " - 'docs/Demo-Sites.md'
- REDISTRIBUTED.md
- CHANGELOG.md
- CONTRIBUTING.md
+ - SECURITY.md
- Why Netdata:
- 'docs/why-netdata/README.md'
- 'docs/why-netdata/1s-granularity.md'
@@ -139,7 +140,7 @@ echo -ne " - 'docs/Demo-Sites.md'
- 'packaging/installer/UPDATE.md'
- 'packaging/installer/UNINSTALL.md'
- 'docs/GettingStarted.md'
-- Running netdata:
+- Running Netdata:
- 'daemon/README.md'
- 'docs/configuration-guide.md'
- 'daemon/config/README.md'
@@ -228,6 +229,7 @@ navpart 3 collectors/ioping.plugin
navpart 3 collectors/freeipmi.plugin
navpart 3 collectors/nfacct.plugin
navpart 3 collectors/xenstat.plugin
+navpart 3 collectors/perf.plugin
echo -ne " - 'docs/Third-Party-Plugins.md'
@@ -251,9 +253,8 @@ navpart 2 web/api/badges "" "" 2
navpart 2 web/api/health "" "" 2
navpart 2 web/api/queries "" "Queries" 2
-echo -ne "- Hacking netdata:
+echo -ne "- Hacking Netdata:
- CODE_OF_CONDUCT.md
- - 'docs/Netdata-Security-and-Disclosure-Information.md'
- CONTRIBUTORS.md
"
navpart 2 packaging/makeself "" "" 4
diff --git a/docs/generator/checklinks.sh b/docs/generator/checklinks.sh
index 6538d39b7..acc144656 100755
--- a/docs/generator/checklinks.sh
+++ b/docs/generator/checklinks.sh
@@ -21,8 +21,8 @@ printhelp () {
By default, nothing is actually checked. The following options tell it what to check:
-a Check all link types
-w Check wiki links (and just warn if you see one)
- -b Check absolute links to the netdata repo (and change them to relative). Only checks links to https://github.com/netdata/netdata/????/master*
- -l Check relative links to the netdata repo (and replace them with links that the html static site can live with, under docs/generator/src only)
+ -b Check absolute links to the Netdata repo (and change them to relative). Only checks links to https://github.com/netdata/netdata/????/master*
+ -l Check relative links to the Netdata repo (and replace them with links that the html static site can live with, under docs/generator/src only)
-e Check external links, outside the wiki or the repo (useless without adding the -u option, to verify that they're not broken)
"
}
@@ -233,7 +233,7 @@ checklinks () {
if [ "$CHKWIKI" -eq 1 ] ; then echo "-- WARNING: $f - $lnk points to the wiki. Please replace it manually" ; fi
;;
https://github.com/netdata/netdata/????/master* )
- echo "-- ERROR: $f - $lnk is an absolute link to a netdata file. Please convert to relative."
+ echo "-- ERROR: $f - $lnk is an absolute link to a Netdata file. Please convert to relative."
EXITCODE=1
;;
http* )
diff --git a/docs/generator/custom/img/favicon.ico b/docs/generator/custom/img/favicon.ico
index 7ed957252..703716cd0 100644
--- a/docs/generator/custom/img/favicon.ico
+++ b/docs/generator/custom/img/favicon.ico
Binary files differ