Resolving conflict

CHANGELOG.md

@@ -2,22 +2,19 @@
 
 ## 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.
 * Created Jitter monitoring panel.
 * 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.

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

README.md

@@ -1,5 +1,5 @@
 # ISP-Checker
-![License](https://img.shields.io/github/license/fmdlc/ISP-Checker) ![LastCommit](https://img.shields.io/github/last-commit/fmdlc/ISP-Checker) ![Docker](https://img.shields.io/badge/Docker-19.03.13-blue) 
+![License](https://img.shields.io/github/license/fmdlc/ISP-Checker) ![LastCommit](https://img.shields.io/github/last-commit/fmdlc/ISP-Checker) ![Docker](https://img.shields.io/badge/Docker-19.03.13-blue)
 
 > A `docker-compose` stack to run a set of ISP controls and collect metrics on a [Raspberry Pi](https://www.raspberrypi.org/).
 
@@ -93,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.
@@ -116,13 +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
 ---
+
 ![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)
 
-=======
->>>>>>> e192546... Releasing version v1.1 - Improvements in graphs and precission about stats.
 ## ToDo
 - [X] Enable Network-dashboard as default dashboard.
 - [ ] Allows users to select their metrics endpoint.