diff --git a/README.md b/README.md index 49f755a..8dba60f 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ - 9009/tcp (PICHAT) - 9010/tcp (SDR) - 9011/tcp (D-STAR) + - **SFTPGo** + - 2022/tcp (SFTP) ## Getting Started diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 13c786a..3142abf 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -3,11 +3,11 @@ metrics { per_host } - log { - output file /var/log/caddy/access.log - format json - level DEBUG - } +# log { +# output file /var/log/caddy/access.log +# format json +# level DEBUG +# } } :2019 { diff --git a/glance/config/home.yml b/glance/config/home.yml index 24ae0eb..fdcf139 100644 --- a/glance/config/home.yml +++ b/glance/config/home.yml @@ -7,10 +7,6 @@ - type: local name: Services - - type: docker-containers - cache: 0s - hide-by-default: false - - type: releases cache: 1d collapse-after: 5 @@ -35,12 +31,12 @@ - schollz/croc - stalwartlabs/stalwart + - type: docker-containers + cache: 0s + hide-by-default: false + - size: full widgets: - - type: to-do - title: To-Do - id: general - - type: group widgets: - type: hacker-news @@ -52,8 +48,6 @@ cache: 1h style: horizontal-cards feeds: - - url: https://registerspill.thorstenball.com/feed - title: Thorsten Ball - url: https://selfh.st/rss/ title: selfh.st diff --git a/glance/docker-compose.yml b/glance/docker-compose.yml index 4b82042..72d9361 100644 --- a/glance/docker-compose.yml +++ b/glance/docker-compose.yml @@ -10,7 +10,6 @@ services: container_name: glance restart: unless-stopped networks: - - glance - caddy volumes: - ./config:/app/config diff --git a/grafana/data/grafana/dashboards/cadvisor-exporter.json b/grafana/data/grafana/dashboards/cadvisor-exporter.json index cdd8cc1..4fab64f 100644 --- a/grafana/data/grafana/dashboards/cadvisor-exporter.json +++ b/grafana/data/grafana/dashboards/cadvisor-exporter.json @@ -19,7 +19,7 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 4, + "id": 1, "links": [], "panels": [ { @@ -69,6 +69,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -83,7 +84,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "red", @@ -111,7 +113,9 @@ ], "displayMode": "table", "placement": "right", - "showLegend": true + "showLegend": true, + "sortBy": "Mean", + "sortDesc": true }, "tooltip": { "hideZeros": false, @@ -119,7 +123,7 @@ "sort": "none" } }, - "pluginVersion": "11.6.0", + "pluginVersion": "12.2.2", "targets": [ { "datasource": { @@ -183,6 +187,7 @@ "type": "linear" }, "showPoints": "never", + "showValues": false, "spanNulls": false, "stacking": { "group": "A", @@ -197,7 +202,8 @@ "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "red", @@ -211,7 +217,7 @@ }, "gridPos": { "h": 8, - "w": 12, + "w": 24, "x": 0, "y": 9 }, @@ -225,7 +231,9 @@ ], "displayMode": "table", "placement": "right", - "showLegend": true + "showLegend": true, + "sortBy": "Mean", + "sortDesc": false }, "tooltip": { "hideZeros": false, @@ -233,7 +241,7 @@ "sort": "none" } }, - "pluginVersion": "11.6.0", + "pluginVersion": "12.2.2", "targets": [ { "datasource": { @@ -250,107 +258,6 @@ "title": "Memory Usage", "type": "timeseries" }, - { - "datasource": { - "type": "prometheus", - "uid": "prometheusdatasource" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "normal" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "bytes" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 9 - }, - "id": 14, - "options": { - "alertThreshold": true, - "legend": { - "calcs": [ - "mean", - "max" - ], - "displayMode": "table", - "placement": "right", - "showLegend": true - }, - "tooltip": { - "hideZeros": false, - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "11.6.0", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "prometheusdatasource" - }, - "expr": "sum(container_memory_cache{instance=~\"$host\",name=~\"$container\",name=~\".+\"}) by (name)", - "hide": false, - "interval": "", - "legendFormat": "{{name}}", - "refId": "A" - } - ], - "title": "Memory Cached", - "type": "timeseries" - }, { "collapsed": false, "gridPos": { @@ -359,220 +266,6 @@ "x": 0, "y": 17 }, - "id": 2, - "panels": [], - "title": "Network", - "type": "row" - }, - { - "datasource": { - "type": "prometheus", - "uid": "prometheusdatasource" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "Bps" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 18 - }, - "id": 4, - "options": { - "alertThreshold": true, - "legend": { - "calcs": [ - "mean", - "max" - ], - "displayMode": "table", - "placement": "right", - "showLegend": true - }, - "tooltip": { - "hideZeros": false, - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "11.6.0", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "prometheusdatasource" - }, - "expr": "sum(rate(container_network_receive_bytes_total{instance=~\"$host\",name=~\"$container\",name=~\".+\"}[5m])) by (name)", - "hide": false, - "interval": "", - "legendFormat": "{{name}}", - "refId": "A" - } - ], - "title": "Received Network Traffic", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "prometheusdatasource" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "barWidthFactor": 0.6, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "Bps" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 18 - }, - "id": 6, - "options": { - "alertThreshold": true, - "legend": { - "calcs": [ - "mean", - "max" - ], - "displayMode": "table", - "placement": "right", - "showLegend": true - }, - "tooltip": { - "hideZeros": false, - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "11.6.0", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "prometheusdatasource" - }, - "expr": "sum(rate(container_network_transmit_bytes_total{instance=~\"$host\",name=~\"$container\",name=~\".+\"}[5m])) by (name)", - "interval": "", - "legendFormat": "{{name}}", - "refId": "A" - } - ], - "title": "Sent Network Traffic", - "type": "timeseries" - }, - { - "collapsed": false, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 26 - }, "id": 19, "panels": [], "title": "Misc", @@ -586,14 +279,23 @@ "fieldConfig": { "defaults": { "custom": { - "filterable": false + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "filterable": false, + "footer": { + "reducers": [] + }, + "inspect": false }, "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green" + "color": "green", + "value": 0 }, { "color": "red", @@ -650,14 +352,15 @@ "h": 10, "w": 24, "x": 0, - "y": 27 + "y": 18 }, "id": 17, "options": { + "cellHeight": "sm", "showHeader": true, "sortBy": [] }, - "pluginVersion": "7.4.5", + "pluginVersion": "12.2.2", "targets": [ { "datasource": { @@ -712,7 +415,7 @@ ], "preload": false, "refresh": "", - "schemaVersion": 41, + "schemaVersion": 42, "tags": [ "cadvisor", "docker" @@ -770,5 +473,5 @@ "timezone": "", "title": "Cadvisor exporter", "uid": "pMEd7m0Mz", - "version": 1 -} \ No newline at end of file + "version": 2 +} diff --git a/prometheus/docker-compose.yml b/prometheus/docker-compose.yml index ebe122d..eae5d87 100644 --- a/prometheus/docker-compose.yml +++ b/prometheus/docker-compose.yml @@ -52,8 +52,10 @@ services: devices: - "/dev/kmsg:/dev/kmsg" command: + - -disable_metrics=advtcp,app,cpuLoad,cpu_topology,cpuset,disk,diskIO,hugetlb,memory_numa,network,oom_event,percpu,perf_event,pressure,process,referenced_memory,resctrl,sched,tcp,udp + - -housekeeping_interval=3s + - -storage_duration=2m - -docker_only - - --disable_metrics=advtcp,cpu_topology,cpuset,hugetlb,memory_numa,process,referenced_memory,resctrl,sched,tcp,udp,percpu,disk,diskIO,oom_event,perf_event volumes: prometheus-data: diff --git a/sftpgo/docker-compose.yml b/sftpgo/docker-compose.yml index b7df0cc..e6bc004 100644 --- a/sftpgo/docker-compose.yml +++ b/sftpgo/docker-compose.yml @@ -9,6 +9,8 @@ services: image: drakkan/sftpgo:v2 container_name: sftpgo restart: unless-stopped + ports: + - 2022:2022 labels: - "com.centurylinklabs.watchtower.enable=true" environment: