docker, apache conf : use agent command, add agent.sample.yml and fix…

… conf

Dockerfile

@@ -29,7 +29,7 @@ WORKDIR /go/bin
 COPY --from=builder /go/src/github.com/sdslabs/pinger/pinger .
 
 # Copy over the agent.yml from Builder image
-# COPY --from=builder /go/src/github.com/sdslabs/pinger/agent.yml .
+COPY --from=builder /go/src/github.com/sdslabs/pinger/agent.yml .
 
 # Final command to run pinger
-CMD [ "./pinger", "version" ]
+CMD [ "./pinger", "agent" ]

agent.sample.yml

@@ -0,0 +1,35 @@
+# agent.yml
+
+# We need to tell Pinger to run the agent in standalone mode since the
+# default behaviour is something else.
+standalone: true
+
+# Configuration for where metrics are stored.
+metrics:
+    backend: timescale
+    host: timescale
+    port: 5432
+    username: postgres
+    password: password
+    db_name: pinger
+    ssl_mode: false # Let's just keep it off for now
+page:
+    deploy: true
+    allowed_origins: ["*"] # For now allow every origin
+    name: My Status Page
+
+# Interval after which metrics are logged into database.
+interval: 5s
+
+checks:
+    - id: ping-google # unique ID
+      name: Ping Google # human-readable name
+      interval: 5s # Ping every 5 seconds
+      timeout: 0.5s # Timeout if it takes longer than half a second
+      input:
+          type: HTTP # Protocol
+      output:
+          type: TIMEOUT # Condition for success/failure
+      target: # Target to hit/request
+          type: URL
+          value: http://www.google.com/

build/docker.sh

@@ -5,6 +5,12 @@ source ./build/util.sh
 set -e
 set -x
 
+FILE=./agent.yml
+
+if [ ! -f "$FILE" ]; then
+    cp agent.sample.yml agent.yml
+fi
+
 # If a tag is not specified, set the tag to "pinger:dev"
 if [ -z "${TAG}" ]
 then

deploy/pinger.apache.conf

@@ -1,6 +1,7 @@
 Listen 80
 <VirtualHost *:80>
-    ServerName pinger.staging.sdslabs.* pinger.sdslabs.*
+    ServerName pinger.staging.sdslabs.*
+    ServerAlias pinger.sdslabs.*
     # Other directives here
     <Location />
         ProxyPass http://127.0.0.1:9010

docs/src/contributing/build-process.md

@@ -60,13 +60,12 @@ $ make docker TAG="pinger:v1.2.3"
 ```
 
 > **Note:** In case of docker image, version defaults to `1.0`
+> **Note:** In case no `agent.yml` is provided, `agent.sample.yml` will be copied to `agent.yml`
 
 ## Docker Compose
 
 A `docker-compose.yml` is also provided to get pinger started more easier.
-Just add an `agent.yml` according to your use case, replace
-`CMD [ "./pinger", "version" ]` in the `Dockerfile` with `CMD [ "./pinger", "agent" ]`
-and then run `docker-compose up`.
+Just add an `agent.yml` according to your use case and then run `docker-compose up`.
 This will get both the timescale db and pinger container up and running in no time!
 
 ## Documentation