Add some monitoring to EDDN status

This commit is contained in:
AnthorNet 2018-12-14 21:36:18 +01:00
parent b0a7d7ffb0
commit 7b4abf66a0
2 changed files with 110 additions and 16 deletions

View File

@ -19,6 +19,7 @@
<script src="https://code.jquery.com/jquery-1.11.3.min.js"></script> <script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
<script src="./js/date.js"></script> <script src="./js/date.js"></script>
<script type="text/javascript" src="./netdata/dashboard.js?v20181412"></script>
</head> </head>
<body data-spy="scroll" data-target="#header-nav" data-offset="70"> <body data-spy="scroll" data-target="#header-nav" data-offset="70">
<header> <header>
@ -37,6 +38,7 @@
<div class="collapse navbar-collapse" id="header-nav"> <div class="collapse navbar-collapse" id="header-nav">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="#monitoring">Server monitoring</a></li>
<li><a href="#gateways">Gateways</a></li> <li><a href="#gateways">Gateways</a></li>
<li><a href="#relays">Relays</a></li> <li><a href="#relays">Relays</a></li>
<li><a href="#software">Software</a></li> <li><a href="#software">Software</a></li>
@ -66,6 +68,70 @@
</div> </div>
</section> </section>
<section id="monitoring" class="container">
<div class="row">
<div class="col-md-12">
<h2>Server monitoring</h2>
</div>
</div>
<div class="row">
<div class="col-md-3 text-center">
<div data-netdata="system.ram"
data-dimensions="used|buffers|active|wired"
data-title="Used RAM"
data-chart-library="easypiechart"
data-append-options="percentage"
data-units="%"
data-easypiechart-max-value="100"
data-colors="#EE9911"
data-width="85%"
data-height="100%"></div>
</div>
<div class="col-md-3 text-center">
<div data-netdata="system.cpu"
data-title="CPU"
data-chart-library="gauge"
data-gauge-max-value="100"
data-units="%"
data-after="-420"
data-points="420"
data-width="100%"
data-height="100%"
data-colors="#22AA99"></div>
<br/>
<div data-netdata="system.load"
data-chart-library="dygraph"
data-dygraph-theme="sparkline"
data-width="100%"
data-height="50px"
data-after="-420"
data-points="420"></div>
</div>
<div class="col-md-3 text-center">
<div data-netdata="system.net"
data-dimensions="received"
data-title="Inbound Traffic"
data-chart-library="easypiechart"
data-after="-420"
data-points="420"
data-width="85%"
data-height="100%"></div>
</div>
<div class="col-md-3 text-center">
<div data-netdata="system.net"
data-dimensions="sent"
data-common-units="system.net.mainhead"
data-title="Outbound Traffic"
data-chart-library="easypiechart"
data-after="-420"
data-points="420"
data-width="85%"
data-height="100%"></div>
</div>
</div>
</section>
<section id="gateways" class="container"> <section id="gateways" class="container">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">

View File

@ -4,46 +4,74 @@
server { server {
listen 80; listen 80;
server_name eddn.edcd.io eddn-status.elite-markets.net; server_name eddn.edcd.io eddn-status.elite-markets.net;
return 301 https://eddn.edcd.io$request_uri; return 301 https://eddn.edcd.io$request_uri;
} }
server { server {
listen 443 ssl default_server; listen 443 ssl default_server;
server_name eddn.edcd.io; server_name eddn.edcd.io;
charset utf8; charset utf8;
gzip on; gzip on;
root /home/EDDN/contrib/monitor; root /home/EDDN/contrib/monitor;
index index.html; index index.html;
ssl_certificate /etc/letsencrypt/live/eddn.edcd.io/fullchain.pem; ssl_certificate /etc/letsencrypt/live/eddn.edcd.io/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/eddn.edcd.io/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/eddn.edcd.io/privkey.pem;
location ~ "^/schemas/(.*)/([\d]{1})(/test)?$" { location ~ "^/schemas/(.*)/([\d]{1})(/test)?$" {
add_header Content-Type application/json; add_header Content-Type application/json;
alias /home/EDDN/schemas/$1-v$2.0.json; alias /home/EDDN/schemas/$1-v$2.0.json;
} }
location = /netdata {
return 301 /netdata/;
}
location ~ /netdata/(?<ndpath>.*) {
proxy_redirect off;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_http_version 1.1;
proxy_pass_request_headers on;
proxy_set_header Connection "keep-alive";
proxy_store off;
proxy_pass http://netdata/$ndpath$is_args$args;
gzip on;
gzip_proxied any;
gzip_types *;
}
}
# NETDATA UPSTREAM
upstream netdata {
server 127.0.0.1:19999;
keepalive 64;
} }
# GATEWAY UPSTREAM # GATEWAY UPSTREAM
upstream gateway { upstream gateway {
server 127.0.0.1:8081 fail_timeout=0; server 127.0.0.1:8081 fail_timeout=0;
} }
server { server {
listen 4430 ssl; listen 4430 ssl;
server_name eddn.edcd.io; server_name eddn.edcd.io;
location / { location / {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_redirect off; proxy_redirect off;
proxy_pass https://gateway; proxy_pass https://gateway;
} }
ssl_certificate /etc/letsencrypt/live/eddn.edcd.io/fullchain.pem; ssl_certificate /etc/letsencrypt/live/eddn.edcd.io/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/eddn.edcd.io/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/eddn.edcd.io/privkey.pem;
} }