diff --git a/CHANGELOG.md b/CHANGELOG.md index c4032d1..5aee15b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ ## October 10 2020 - v1.1 -<<<<<<< HEAD * Updated Speedtest checks to run once per hour (before was every 5 minutes). * Removed Telegraf' Speedtest `--no-pre-allocate` version. * Improved MTR metrics. @@ -10,14 +9,12 @@ * Created availability row and panels. * Created Ping per destination panel. * Included variables to define panel data. -======= * Updated Speedtest checks to run once peer hour (before was every 5 minutes). * Removed Telegraf' Speedtest `--no-pre-allocate` version. * Created Jitter monitoring panel. * Created availability row and panels. * Created Ping per destination panel. * Included variables to define panels data. ->>>>>>> e192546... Releasing version v1.1 - Improvements in graphs and precission about stats. * Addeed netstat stadistics. * Updated documentation. * Included system metrics dashboard. diff --git a/ISP-Checker/docker/docker-compose.yaml b/ISP-Checker/docker/docker-compose.yaml index 46fa66c..043d23e 100644 --- a/ISP-Checker/docker/docker-compose.yaml +++ b/ISP-Checker/docker/docker-compose.yaml @@ -1,6 +1,9 @@ version: "3.3" services: influxdb: + labels: + - "docker.group=ISP-Checker" + - "docker.app=influxdb" container_name: influxdb image: influxdb:latest expose: @@ -13,6 +16,9 @@ services: ports: - 8086:8086 telegraf: + labels: + - "docker.group=ISP-Checker" + - "docker.app=telegraf" container_name: telegraf image: tty0/isp_telegraf:latest volumes: @@ -24,6 +30,9 @@ services: depends_on: - "influxdb" grafana: + labels: + - "docker.group=ISP-Checker" + - "docker.app=grafana" container_name: grafana image: grafana/grafana:latest environment: diff --git a/ISP-Checker/grafana/network-dashboard.json b/ISP-Checker/grafana/network-dashboard.json index 48b6f6e..31f1adc 100644 --- a/ISP-Checker/grafana/network-dashboard.json +++ b/ISP-Checker/grafana/network-dashboard.json @@ -3612,7 +3612,7 @@ ] }, "time": { - "from": "now-15m", + "from": "now-30m", "to": "now" }, "timepicker": {}, diff --git a/ISP-Checker/telegraf/conf/telegraf.conf b/ISP-Checker/telegraf/conf/telegraf.conf index 9544d8b..e0b95c8 100644 --- a/ISP-Checker/telegraf/conf/telegraf.conf +++ b/ISP-Checker/telegraf/conf/telegraf.conf @@ -44,19 +44,11 @@ [[inputs.system]] [[inputs.dns_query]] -<<<<<<< HEAD - servers = ["4.2.2.1", "4.2.2.2", "8.8.8.8"] - domains = ["www.google.com", "www.twitter.com", "www.amazon.com", "www.yahoo.com"] - record_type = "A" - port = 53 - timeout = 2 -======= servers = ["4.2.2.1", "8.8.8.8"] domains = ["www.google.com", "www.twitter.com", "www.amazon.com", "www.wikipedia.org"] record_type = "A" port = 53 timeout = 3 ->>>>>>> e192546... Releasing version v1.1 - Improvements in graphs and precission about stats. [[inputs.http_response]] urls = [ @@ -95,13 +87,8 @@ ipv6 = false [[inputs.exec]] -<<<<<<< HEAD - commands=["mtr -C 4.2.2.1 8.8.8.8 amazon.com twitter.com google.com"] - timeout = "2m" -======= commands=["mtr -C google.com s3-website.ap-northeast-2.amazonaws.com s3-website.eu-central-1.amazonaws.com s3-website.af-south-1.amazonaws.com"] timeout = "3m" ->>>>>>> e192546... Releasing version v1.1 - Improvements in graphs and precission about stats. interval = "10m" data_format = "csv" csv_skip_rows = 1 diff --git a/README.md b/README.md index 4755335..3833c71 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,9 @@ > A `docker-compose` stack to run a set of ISP controls and collect metrics on a [Raspberry Pi](https://www.raspberrypi.org/). -[Fibertel](http://www.fibertel.com/), the most popular Argentinian Internet provider always has connectivity issues. It inspired me to use a Raspberry Pi and build some type of monitoring to aggregate metrics. I have been using [Grafana](http://grafana.com) at work for several years, so why not using the same logic?. +[![Linkedin](https://i.stack.imgur.com/gVE0j.png) LinkedIn](https://www.linkedin.com/in/fmdlc) [![GitHub](https://i.stack.imgur.com/tskMh.png) GitHub](https://github.com/fmdlc) + +[Fibertel](http://www.fibertel.com/), the most popular Argentinian Internet provider always has connectivity issues. It inspired me to use a Raspberry Pi and build some type of monitoring to aggregate metrics. I have been using [Grafana](http://grafana.com) at work for several years, so why not use the same logic?. `ISP-Checker` implements a set of [Telegraf](https://github.com/influxdata/telegraf) checks that sends metrics to [InfluxDB](https://www.influxdata.com/) (a OpenSource, time series based database) and runs several kind of metrics collectors to get average/aggregation/integral of values at first glance and focusing on service quality. @@ -14,12 +16,13 @@ It's easily extensible and it was built on top of [Docker](http://docker.com) to Feel free to reach me out for any feedback or ideas! :-)
+ +
-![Demo](./img/demo.gif) +#### Grafana Cloud - +You can easily import this dashboard into your current Grafana installation getting it from the Official's [Grafana repository](https://grafana.com/grafana/dashboards/13140). -[![Linkedin](https://i.stack.imgur.com/gVE0j.png) LinkedIn](https://www.linkedin.com/in/fmdlc) [![GitHub](https://i.stack.imgur.com/tskMh.png) GitHub](https://github.com/fmdlc) ### Configuration Make sure you have the [Docker-CE](https://phoenixnap.com/kb/docker-on-raspberry-pi) and [cURL](https://curl.haxx.se/) installed on your *Raspberry Pi*. If you don't, install it using your prefer method. @@ -90,11 +93,7 @@ To remove run `make prune`. > It will remove all stopped containers (yes, not only the ISP-Checker ones). -<<<<<<< HEAD --- - -======= ->>>>>>> e192546... Releasing version v1.1 - Improvements in graphs and precission about stats. ### Bandwith Bandwidth is the maximum rate of data transfer across a given path. Bandwidth may be characterized as network bandwidth or data bandwidth. The difference between internet speed and bandwidth can be summed in one line. Internet bandwidth is about how much data can be download or uploaded from your computer, while internet speed is how fast can the data be uploaded or downloaded on your computer. @@ -113,11 +112,11 @@ Download and upload are important metrics but don't paint the entire picture of But, latency only paints half the picture. Imagine yourself in a conversation where you have some delay before you hear what the other person says. That may be annoying but after a while you get used to it. What would be even worse is if the delay differed constantly: sometimes the audio is almost in sync and sometimes it has a delay of a few seconds. You can imagine how often this would result into two people starting to talk at the same time. This is directly related to how stable your latency is and is represented by the jitter metric. Jitter is the average variation found in consecutive latency measurements. A lower number means that the latencies measured are more consistent, meaning your media streams will have the same delay throughout the session. -<<<<<<< HEAD --- -======= ->>>>>>> e192546... Releasing version v1.1 - Improvements in graphs and precission about stats. +![https://github.com/fmdlc/ISP-Checker/blob/master/img/img_4.png?raw=true](https://github.com/fmdlc/ISP-Checker/blob/master/img/img_4.png?raw=true) +![https://github.com/fmdlc/ISP-Checker/blob/master/img/img_1.png?raw=true](https://github.com/fmdlc/ISP-Checker/blob/master/img/img_1.png?raw=true) + ## ToDo - [X] Enable Network-dashboard as default dashboard. - [ ] Allows users to select their metrics endpoint. diff --git a/img/demo.gif b/img/demo.gif index 63b203e..2fd3cb9 100644 Binary files a/img/demo.gif and b/img/demo.gif differ diff --git a/img/img_1.png b/img/img_1.png new file mode 100644 index 0000000..a87efd0 Binary files /dev/null and b/img/img_1.png differ diff --git a/img/img_2.png b/img/img_2.png new file mode 100644 index 0000000..b0f7588 Binary files /dev/null and b/img/img_2.png differ diff --git a/img/img_3.png b/img/img_3.png new file mode 100644 index 0000000..13555ae Binary files /dev/null and b/img/img_3.png differ diff --git a/img/img_4.png b/img/img_4.png new file mode 100644 index 0000000..22011ab Binary files /dev/null and b/img/img_4.png differ