Merge pull request #9 from HEET-Group/devDocker-addingGrafana

Dev docker adding grafana

Author: HaoyL666

examples/docker/README.md

@@ -1,12 +1,14 @@
 # Chronos Dockerized Microservices Example
 
 This sample microservices architecture allows developers to explore the functionality of Chronos but with one docker compose command. This consists of four microservices, which are contained within the directories:
+
 - books
 - customers
 - frontend
 - orders
 
 Each microservice has its own server, which receives requests from both the client and from other microservices.
+
 - _books_, _customers_, and _orders_ also have their own databases, which they can query to respond to those requests.
 
 The frontend has a reverse proxy set up for proxying requests to the appropriate service (individual application) in the microservice network.
@@ -22,12 +24,14 @@ Docker also ensures that the versions that worked well on dev are bundled up and
 For additional details on how Chronos works this example, please review the Docker section in the [Chronos NPM Package README](../../chronos_npm_package/README.md).
 
 ## Steps to Run Example
+
 Peform the following steps in each of the _books_, _customers_, _frontend_, and _orders_ directories
 
-1. Add a `.env` file to *each* folder with the following key/value pairs:
+1. Add a `.env` file to _each_ folder with the following key/value pairs:
+
 - **NOTE**: Ensure that there are no quotes surrounding any of the keys and values.
 
->>>New collaboration group - testing all 5 url added to each .env// --> testing now...<<<
+> > > New collaboration group - testing all 5 url added to each .env// --> testing now...<<<
 
 ```
 CHRONOS_DB = MongoDB or PostgreSQL
@@ -36,21 +40,24 @@ BOOK_URI = A MongoDB URI for the bookserver microservice to use
 CUSTOMER_URI = A MongoDB URI for the customerserver microservice to use
 ORDER_URI = A MongoDB URI for the orderserver microservice to use
 ```
+
 2.  Verify that `@chronosmicro/tracker` is a dependency in each of the _books_, _customers_, _frontend_, and _orders_ folders (see the `package.json` in each folder).
 
     - If the @chronosmicro/tracker dependency is listed as a **remote** npm package (i.e. `"@chronosmicro/tracker": "^11.0.1"`) and you've ran `npm install`, no further work is needed continue to step 3.
 
     - If you have the dependency as
-    `"@chronosmicro/tracker": "file:./chronos_npm_package"`, which is a **local** file, make sure to change the version from `"file:./chronos_npm_package"` to `"^11.0.1"` and run npm install.
+      `"@chronosmicro/tracker": "file:./chronos_npm_package"`, which is a **local** file, make sure to change the version from `"file:./chronos_npm_package"` to `"^11.0.1"` and run npm install.
+
+3.  With the terminal navigated to the the _examples/docker_ folder, run the command:
 
-3. With the terminal navigated to the the _examples/docker_ folder, run the command:
+> > > No working, installing VSC docker ext<<< --must have docker installed for this command to run
 
->>>No working, installing VSC docker ext<<< --must have docker installed for this command to run
 ```
 docker-compose -f docker-compose.yml up
 ```
 
-#
+4. If you run into any issues regarding 'linux/amd64,linux/arm/v7,linux/arm64/v8' for cadvisor, navigate to the docker-compose.yml and find the cadvisor dictionary. Change "platform" to linux/arm64/v8 for M1 Chips and linux/amd64 for Intel Chips.
+###
 
 You should now see the containers running in your terminal, each reporting `"Docker data recorded in..."`.
 
@@ -85,6 +92,7 @@ Use `docker compose down` to remove.
 Chronos hopes to inspire an active community of both users and developers. For questions, comments, or contributions, please submit a pull request.
 
 Read our [contributing README](../../CONTRIBUTING.md) to further learn how you can take part in improving Chronos.
+
 ## License
 
-[MIT](https://github.com/oslabs-beta/Chronos/blob/master/LICENSE.md)
+[MIT](https://github.com/oslabs-beta/Chronos/blob/master/LICENSE.md)

examples/docker/docker-compose.yml

@@ -82,9 +82,10 @@ services:
       - orders
 
   cadvisor:
-    image: gcr.io/cadvisor/cadvisor:latest
+    image: gcr.io/cadvisor/cadvisor:v0.47.0
     container_name: cadvisor
     privileged: true
+    platform: linux/arm64/v8
     ports:
       - 8080:8080
     volumes:
@@ -108,6 +109,7 @@ services:
       - --config.file=/etc/prometheus/prometheus.yml
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+
     depends_on:
       - cadvisor
 
@@ -118,7 +120,8 @@ services:
       - 2999:3000
     volumes:
       # Share the named volume with the grafana container
-      - grafana-dir:/etc/grafana
+      - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
+      - ./grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards
     environment:
       GF_PATHS_CONFIG: /etc/grafana/grafana.ini
       GF_SECURITY_ALLOW_EMBEDDING: 'true'