Merge branch 'master' into portal-latest
This commit is contained in:
commit
e95f0e2c9c
|
@ -0,0 +1 @@
|
||||||
|
- Set `min_free` parameter on the `proxy_cache_path` directive to `100g`
|
|
@ -70,7 +70,7 @@ http {
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
|
|
||||||
# proxy cache definition
|
# proxy cache definition
|
||||||
proxy_cache_path /data/nginx/cache levels=1:2 keys_zone=skynet:10m max_size=50g inactive=48h use_temp_path=off;
|
proxy_cache_path /data/nginx/cache levels=1:2 keys_zone=skynet:10m max_size=50g min_free=100g inactive=48h use_temp_path=off;
|
||||||
|
|
||||||
# this runs before forking out nginx worker processes
|
# this runs before forking out nginx worker processes
|
||||||
init_by_lua_block {
|
init_by_lua_block {
|
||||||
|
|
|
@ -72,7 +72,9 @@ async def check_load_average():
|
||||||
load_av = re.match(pattern, uptime_string).group(1)
|
load_av = re.match(pattern, uptime_string).group(1)
|
||||||
if float(load_av) > 10:
|
if float(load_av) > 10:
|
||||||
message = "High system load detected in uptime output: {}".format(uptime_string)
|
message = "High system load detected in uptime output: {}".format(uptime_string)
|
||||||
await send_msg(message, force_notify=True)
|
# Disabling pings until we have metrics solution and process to better
|
||||||
|
# address
|
||||||
|
await send_msg(message, force_notify=False)
|
||||||
|
|
||||||
|
|
||||||
# check_disk checks the amount of free space on the /home partition and issues
|
# check_disk checks the amount of free space on the /home partition and issues
|
||||||
|
@ -109,7 +111,9 @@ async def check_disk():
|
||||||
|
|
||||||
# dump disk usage
|
# dump disk usage
|
||||||
script_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
|
script_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
|
||||||
os.popen(script_dir + "/disk-usage-dump.sh " + script_dir + "/" + DISK_USAGE_DUMP_LOG)
|
os.popen(
|
||||||
|
script_dir + "/disk-usage-dump.sh " + script_dir + "/" + DISK_USAGE_DUMP_LOG
|
||||||
|
)
|
||||||
|
|
||||||
inspect = os.popen("docker inspect sia").read().strip()
|
inspect = os.popen("docker inspect sia").read().strip()
|
||||||
inspect_json = json.loads(inspect)
|
inspect_json = json.loads(inspect)
|
||||||
|
|
Reference in New Issue