diff --git a/en_US/integrations/0-integration.netdata.freebsd.md b/en_US/integrations/0-integration.netdata.freebsd.md index 3cc79230..8ee9f5c9 100644 --- a/en_US/integrations/0-integration.netdata.freebsd.md +++ b/en_US/integrations/0-integration.netdata.freebsd.md @@ -4,8 +4,8 @@ !!! attention - * This tutorial is tested on FreeBSD 11.x. If you need to run netdata on - CentOS, Debian, Ubuntu, please check this tutorial instead: + * This tutorial is tested on FreeBSD 11.x. For CentOS, Debian, Ubuntu, + please check this tutorial instead: [Integrate netdata on Linux](./integration.netdata.linux.html). * netdata is an optional component since iRedMail-0.9.8. @@ -266,13 +266,36 @@ server { } ``` -* Create new file `/usr/local/etc/nginx/netdata.users` and an account used to access - netdata. NOTE: Please replace `` below by a real, strong password. +* Create new file `/usr/local/etc/nginx/netdata.users` used for basic http auth: ``` touch /usr/local/etc/nginx/netdata.users +``` + +* Run command below to generate a SSHA password hash. NOTE: Please replace + `` below by a real, strong password. + +``` doveadm pw -s SSHA -p '' ``` -* Now restart nginx service and access url `https://your-server/netdata/` - (please replace `your-server` by the real domain name). +The password looks like this `{SSHA}Tama1midwSV6XWTlonR6n6sNM8yuEPvv`. + +* Now open `/usr/local/etc/nginx/netdata.users` with your faviourite text + editor, add a line like below to create an account used to access netdata. + The format is `:`. + +``` +postmaster@domain.com:{SSHA}Tama1midwSV6XWTlonR6n6sNM8yuEPvv +``` + +* Restart nginx service. + +Now open a web browser and access url `https://your-server/netdata/` (please +replace `your-server` by the real domain name), it will ask you to input +username and password for authentication, please use the account we just added +in file `/usr/local/etc/nginx/netdata.users` to login. + +This is what you see after successfully logged in: + +![](./images/netdata/system-overview.png){: width="900px" } diff --git a/en_US/integrations/0-integration.netdata.linux.md b/en_US/integrations/0-integration.netdata.linux.md index 56e51c21..d96f277d 100644 --- a/en_US/integrations/0-integration.netdata.linux.md +++ b/en_US/integrations/0-integration.netdata.linux.md @@ -337,13 +337,36 @@ server { } ``` -* Create new file `/etc/nginx/netdata.users` and an account used to access - netdata. NOTE: Please replace `` below by a real, strong password. +* Create new file `/etc/nginx/netdata.users` used for basic http auth: ``` touch /etc/nginx/netdata.users +``` + +* Run command below to generate a SSHA password hash. NOTE: Please replace + `` below by a real, strong password. + +``` doveadm pw -s SSHA -p '' ``` -* Now restart nginx service and access url `https://your-server/netdata/` - (please replace `your-server` by the real domain name). +The password looks like this `{SSHA}Tama1midwSV6XWTlonR6n6sNM8yuEPvv`. + +* Now open `/etc/nginx/netdata.users` with your faviourite text + editor, add a line like below to create an account used to access netdata. + The format is `:`. + +``` +postmaster@domain.com:{SSHA}Tama1midwSV6XWTlonR6n6sNM8yuEPvv +``` + +* Restart nginx service. + +Now open a web browser and access url `https://your-server/netdata/` (please +replace `your-server` by the real domain name), it will ask you to input +username and password for authentication, please use the account we just added +in file `/etc/nginx/netdata.users` to login. + +This is what you see after successfully logged in: + +![](./images/netdata/system-overview.png){: width="900px" } diff --git a/html/images/netdata/system-overview.png b/html/images/netdata/system-overview.png new file mode 100644 index 00000000..0b496f77 Binary files /dev/null and b/html/images/netdata/system-overview.png differ diff --git a/html/integration.netdata.freebsd.html b/html/integration.netdata.freebsd.html index 267971b2..111a0a30 100644 --- a/html/integration.netdata.freebsd.html +++ b/html/integration.netdata.freebsd.html @@ -36,8 +36,8 @@

Attention

    -
  • This tutorial is tested on FreeBSD 11.x. If you need to run netdata on - CentOS, Debian, Ubuntu, please check this tutorial instead: +
  • This tutorial is tested on FreeBSD 11.x. For CentOS, Debian, Ubuntu, + please check this tutorial instead: Integrate netdata on Linux.
  • netdata is an optional component since iRedMail-0.9.8.
@@ -293,17 +293,36 @@ location ~ /netdata/(?<ndpath>.*) {
    -
  • Create new file /usr/local/etc/nginx/netdata.users and an account used to access - netdata. NOTE: Please replace <password> below by a real, strong password.
    • +
  • Create new file /usr/local/etc/nginx/netdata.users used for basic http auth:
touch /usr/local/etc/nginx/netdata.users
-doveadm pw -s SSHA -p '<password>'
    -
  • Now restart nginx service and access url https://your-server/netdata/ - (please replace your-server by the real domain name).
    • -
+
  • Run command below to generate a SSHA password hash. NOTE: Please replace + <password> below by a real, strong password.
    • + +
    doveadm pw -s SSHA -p '<password>'
+
    + +

    The password looks like this {SSHA}Tama1midwSV6XWTlonR6n6sNM8yuEPvv.

    +
      +
    • Now open /usr/local/etc/nginx/netdata.users with your faviourite text + editor, add a line like below to create an account used to access netdata. + The format is <username>:<password>.
      • +
    +
    postmaster@domain.com:{SSHA}Tama1midwSV6XWTlonR6n6sNM8yuEPvv
+
    + +
      +
    • Restart nginx service.
      • +
    +

    Now open a web browser and access url https://your-server/netdata/ (please +replace your-server by the real domain name), it will ask you to input +username and password for authentication, please use the account we just added +in file /usr/local/etc/nginx/netdata.users to login.

    +

    This is what you see after successfully logged in:

    +

    All documents are available in BitBucket repository, and published under Creative Commons license. You can download the latest version for offline reading. If you found something wrong, please do contact us to fix it.

    diff --git a/html/integration.netdata.linux.html b/html/integration.netdata.linux.html index 0c443181..827de821 100644 --- a/html/integration.netdata.linux.html +++ b/html/integration.netdata.linux.html @@ -356,17 +356,36 @@ location ~ /netdata/(?<ndpath>.*) {
      -
    • Create new file /etc/nginx/netdata.users and an account used to access - netdata. NOTE: Please replace <password> below by a real, strong password.
      • +
    • Create new file /etc/nginx/netdata.users used for basic http auth:
    touch /etc/nginx/netdata.users
-doveadm pw -s SSHA -p '<password>'
      -
    • Now restart nginx service and access url https://your-server/netdata/ - (please replace your-server by the real domain name).
      • -
    +
  • Run command below to generate a SSHA password hash. NOTE: Please replace + <password> below by a real, strong password.
    • + +
    doveadm pw -s SSHA -p '<password>'
+
    + +

    The password looks like this {SSHA}Tama1midwSV6XWTlonR6n6sNM8yuEPvv.

    +
      +
    • Now open /etc/nginx/netdata.users with your faviourite text + editor, add a line like below to create an account used to access netdata. + The format is <username>:<password>.
      • +
    +
    postmaster@domain.com:{SSHA}Tama1midwSV6XWTlonR6n6sNM8yuEPvv
+
    + +
      +
    • Restart nginx service.
      • +
    +

    Now open a web browser and access url https://your-server/netdata/ (please +replace your-server by the real domain name), it will ask you to input +username and password for authentication, please use the account we just added +in file /etc/nginx/netdata.users to login.

    +

    This is what you see after successfully logged in:

    +

    All documents are available in BitBucket repository, and published under Creative Commons license. You can download the latest version for offline reading. If you found something wrong, please do contact us to fix it.