cleanups
This commit is contained in:
@@ -1,44 +0,0 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name localhost;
|
||||
|
||||
#access_log /var/log/nginx/host.access.log main;
|
||||
|
||||
location / {
|
||||
root /usr/share/nginx/html;
|
||||
index index.html index.htm;
|
||||
}
|
||||
|
||||
#error_page 404 /404.html;
|
||||
|
||||
# redirect server error pages to the static page /50x.html
|
||||
#
|
||||
error_page 500 502 503 504 /50x.html;
|
||||
location = /50x.html {
|
||||
root /usr/share/nginx/html;
|
||||
}
|
||||
|
||||
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
|
||||
#
|
||||
#location ~ \.php$ {
|
||||
# proxy_pass http://127.0.0.1;
|
||||
#}
|
||||
|
||||
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
|
||||
#
|
||||
#location ~ \.php$ {
|
||||
# root html;
|
||||
# fastcgi_pass 127.0.0.1:9000;
|
||||
# fastcgi_index index.php;
|
||||
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
|
||||
# include fastcgi_params;
|
||||
#}
|
||||
|
||||
# deny access to .htaccess files, if Apache's document root
|
||||
# concurs with nginx's one
|
||||
#
|
||||
#location ~ /\.ht {
|
||||
# deny all;
|
||||
#}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@ angie_connections_idle $p8s_value
|
||||
type=gauge
|
||||
'help=The current number of idle client connections.';
|
||||
|
||||
|
||||
'angie_slabs_pages_used{zone="$1"}' $p8s_value
|
||||
path=~^/slabs/([^/]+)/pages/used$
|
||||
type=gauge
|
||||
@@ -31,7 +30,6 @@ angie_connections_idle $p8s_value
|
||||
type=gauge
|
||||
'help=The number of currently free memory pages in a slab zone.';
|
||||
|
||||
|
||||
'angie_slabs_pages_slots_used{zone="$1",size="$2"}' $p8s_value
|
||||
path=~^/slabs/([^/]+)/slots/([^/]+)/used$
|
||||
type=gauge
|
||||
@@ -52,7 +50,6 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The number of unsuccessful attempts to allocate a memory slot of a specific size in a slab zone.';
|
||||
|
||||
|
||||
'angie_resolvers_queries{zone="$1",type="$2"}' $p8s_value
|
||||
path=~^/resolvers/([^/]+)/queries/([^/]+)$
|
||||
type=counter
|
||||
@@ -68,7 +65,6 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The number of resolution results with a specific status in a resolver zone.';
|
||||
|
||||
|
||||
'angie_http_server_zones_ssl_handshaked{zone="$1"}' $p8s_value
|
||||
path=~^/http/server_zones/([^/]+)/ssl/handshaked$
|
||||
type=counter
|
||||
@@ -89,7 +85,6 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of failed SSL handshakes in an HTTP server zone.';
|
||||
|
||||
|
||||
'angie_http_server_zones_requests_total{zone="$1"}' $p8s_value
|
||||
path=~^/http/server_zones/([^/]+)/requests/total$
|
||||
type=counter
|
||||
@@ -105,13 +100,11 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of client requests completed in an HTTP server zone without sending a response.';
|
||||
|
||||
|
||||
'angie_http_server_zones_responses{zone="$1",code="$2"}' $p8s_value
|
||||
path=~^/http/server_zones/([^/]+)/responses/([^/]+)$
|
||||
type=counter
|
||||
'help=The number of responses with a specific status in an HTTP server zone.';
|
||||
|
||||
|
||||
'angie_http_server_zones_data_received{zone="$1"}' $p8s_value
|
||||
path=~^/http/server_zones/([^/]+)/data/received$
|
||||
type=counter
|
||||
@@ -122,7 +115,6 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of bytes sent to clients in an HTTP server zone.';
|
||||
|
||||
|
||||
'angie_http_location_zones_requests_total{zone="$1"}' $p8s_value
|
||||
path=~^/http/location_zones/([^/]+)/requests/total$
|
||||
type=counter
|
||||
@@ -133,13 +125,11 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of client requests completed in an HTTP location zone without sending a response.';
|
||||
|
||||
|
||||
'angie_http_location_zones_responses{zone="$1",code="$2"}' $p8s_value
|
||||
path=~^/http/location_zones/([^/]+)/responses/([^/]+)$
|
||||
type=counter
|
||||
'help=The number of responses with a specific status in an HTTP location zone.';
|
||||
|
||||
|
||||
'angie_http_location_zones_data_received{zone="$1"}' $p8s_value
|
||||
path=~^/http/location_zones/([^/]+)/data/received$
|
||||
type=counter
|
||||
@@ -150,13 +140,11 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of bytes sent to clients in an HTTP location zone.';
|
||||
|
||||
|
||||
'angie_http_upstreams_peers_state{upstream="$1",peer="$2"}' $p8st_all_ups_state
|
||||
path=~^/http/upstreams/([^/]+)/peers/([^/]+)/state$
|
||||
type=gauge
|
||||
'help=The current state of an upstream peer in "HTTP": 1 - up, 2 - down, 3 - unavailable, or 4 - recovering.';
|
||||
|
||||
|
||||
'angie_http_upstreams_peers_selected_current{upstream="$1",peer="$2"}' $p8s_value
|
||||
path=~^/http/upstreams/([^/]+)/peers/([^/]+)/selected/current$
|
||||
type=gauge
|
||||
@@ -167,13 +155,11 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of attempts to use an upstream peer in "HTTP".';
|
||||
|
||||
|
||||
'angie_http_upstreams_peers_responses{upstream="$1",peer="$2",code="$3"}' $p8s_value
|
||||
path=~^/http/upstreams/([^/]+)/peers/([^/]+)/responses/([^/]+)$
|
||||
type=counter
|
||||
'help=The number of responses with a specific status received from an upstream peer in "HTTP".';
|
||||
|
||||
|
||||
'angie_http_upstreams_peers_data_sent{upstream="$1",peer="$2"}' $p8s_value
|
||||
path=~^/http/upstreams/([^/]+)/peers/([^/]+)/data/sent$
|
||||
type=counter
|
||||
@@ -184,7 +170,6 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of bytes received from an upstream peer in "HTTP".';
|
||||
|
||||
|
||||
'angie_http_upstreams_peers_health_fails{upstream="$1",peer="$2"}' $p8s_value
|
||||
path=~^/http/upstreams/([^/]+)/peers/([^/]+)/health/fails$
|
||||
type=counter
|
||||
@@ -200,13 +185,11 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total time (in milliseconds) that an upstream peer in "HTTP" was "unavailable".';
|
||||
|
||||
|
||||
'angie_http_upstreams_keepalive{upstream="$1"}' $p8s_value
|
||||
path=~^/http/upstreams/([^/]+)/keepalive$
|
||||
type=gauge
|
||||
'help=The number of currently cached keepalive connections for an HTTP upstream.';
|
||||
|
||||
|
||||
'angie_http_caches_responses{zone="$1",status="$2"}' $p8s_value
|
||||
path=~^/http/caches/([^/]+)/([^/]+)/responses$
|
||||
type=counter
|
||||
@@ -227,19 +210,16 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of bytes written to an HTTP cache zone with a specific cache status.';
|
||||
|
||||
|
||||
'angie_http_caches_size{zone="$1"}' $p8s_value
|
||||
path=~^/http/caches/([^/]+)/size$
|
||||
type=gauge
|
||||
'help=The current size (in bytes) of cached responses in an HTTP cache zone.';
|
||||
|
||||
|
||||
'angie_http_caches_shards_size{zone="$1",path="$2"}' $p8s_value
|
||||
path=~^/http/caches/([^/]+)/shards/([^/]+)/size$
|
||||
type=gauge
|
||||
'help=The current size (in bytes) of cached responses in a shard path of an HTTP cache zone.';
|
||||
|
||||
|
||||
'angie_http_limit_conns{zone="$1",status="$2"}' $p8s_value
|
||||
path=~^/http/limit_conns/([^/]+)/([^/]+)$
|
||||
type=counter
|
||||
@@ -250,7 +230,6 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The number of requests processed by an HTTP limit_reqs zone with a specific result.';
|
||||
|
||||
|
||||
'angie_stream_server_zones_ssl_handshaked{zone="$1"}' $p8s_value
|
||||
path=~^/stream/server_zones/([^/]+)/ssl/handshaked$
|
||||
type=counter
|
||||
@@ -271,7 +250,6 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of failed SSL handshakes in a stream server zone.';
|
||||
|
||||
|
||||
'angie_stream_server_zones_connections_total{zone="$1"}' $p8s_value
|
||||
path=~^/stream/server_zones/([^/]+)/connections/total$
|
||||
type=counter
|
||||
@@ -292,13 +270,11 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of client connections in a stream server zone passed for handling to a different listening socket.';
|
||||
|
||||
|
||||
'angie_stream_server_zones_sessions{zone="$1",status="$2"}' $p8s_value
|
||||
path=~^/stream/server_zones/([^/]+)/sessions/([^/]+)$
|
||||
type=counter
|
||||
'help=The number of sessions finished with a specific status in a stream server zone.';
|
||||
|
||||
|
||||
'angie_stream_server_zones_data_received{zone="$1"}' $p8s_value
|
||||
path=~^/stream/server_zones/([^/]+)/data/received$
|
||||
type=counter
|
||||
@@ -309,13 +285,11 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of bytes sent to clients in a stream server zone.';
|
||||
|
||||
|
||||
'angie_stream_upstreams_peers_state{upstream="$1",peer="$2"}' $p8st_all_ups_state
|
||||
path=~^/stream/upstreams/([^/]+)/peers/([^/]+)/state$
|
||||
type=gauge
|
||||
'help=The current state of an upstream peer in "stream": 1 - up, 2 - down, 3 - unavailable, or 4 - recovering.';
|
||||
|
||||
|
||||
'angie_stream_upstreams_peers_selected_current{upstream="$1",peer="$2"}' $p8s_value
|
||||
path=~^/stream/upstreams/([^/]+)/peers/([^/]+)/selected/current$
|
||||
type=gauge
|
||||
@@ -326,7 +300,6 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of attempts to use an upstream peer in "stream".';
|
||||
|
||||
|
||||
'angie_stream_upstreams_peers_data_sent{upstream="$1",peer="$2"}' $p8s_value
|
||||
path=~^/stream/upstreams/([^/]+)/peers/([^/]+)/data/sent$
|
||||
type=counter
|
||||
@@ -337,7 +310,6 @@ angie_connections_idle $p8s_value
|
||||
type=counter
|
||||
'help=The total number of bytes received from an upstream peer in "stream".';
|
||||
|
||||
|
||||
'angie_stream_upstreams_peers_health_fails{upstream="$1",peer="$2"}' $p8s_value
|
||||
path=~^/stream/upstreams/([^/]+)/peers/([^/]+)/health/fails$
|
||||
type=counter
|
||||
@@ -360,5 +332,9 @@ map $p8s_value $p8st_all_ups_state {
|
||||
"down" 2;
|
||||
"unavailable" 3;
|
||||
"recovering" 4;
|
||||
# "unhealthy" 5;
|
||||
# "checking" 6;
|
||||
# "draining" 7;
|
||||
"busy" 8;
|
||||
default 0;
|
||||
}
|
||||
}
|
||||
@@ -1,26 +1,29 @@
|
||||
#include conf.d/prometheus_all.conf;
|
||||
include conf.d/prometheus_all.conf;
|
||||
|
||||
server {
|
||||
listen 84;
|
||||
listen 86;
|
||||
|
||||
acceess_log off;
|
||||
error_log off;
|
||||
|
||||
auto_redirect on;
|
||||
|
||||
location /nginx_status {
|
||||
stub_status on;
|
||||
access_log off;
|
||||
allow all;
|
||||
stub_status on;
|
||||
access_log off;
|
||||
allow all;
|
||||
}
|
||||
|
||||
auto_redirect on;
|
||||
location /status/ {
|
||||
api /status/;
|
||||
api_config_files on;
|
||||
}
|
||||
|
||||
location /status/ {
|
||||
api /status/;
|
||||
api_config_files on;
|
||||
}
|
||||
|
||||
location /console/ {
|
||||
alias /usr/share/angie-console-light/html/;
|
||||
index index.html;
|
||||
}
|
||||
location /console/ {
|
||||
alias /usr/share/angie-console-light/html/;
|
||||
index index.html;
|
||||
}
|
||||
|
||||
location /console/api/ {
|
||||
api /status/;
|
||||
|
||||
Reference in New Issue
Block a user