From fbacb81a32c6df6140fb4c995b0d2876312543aa Mon Sep 17 00:00:00 2001 From: Shayan Ghani Date: Sat, 3 May 2025 15:41:11 +0330 Subject: [PATCH 1/3] update readme --- README.md | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b86bc1b..f4075c4 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ A resource-friendly, highly efficient, and minimal Prometheus exporter to track 3. [Step-by-Step Guide](#-step-by-step-guide) 1. [Before You start](#before-you-start) 2. [Getting started](#getting-started) + - [Deploy with Github Actions](#-deploy-with-github-actions) - [Deploy with Docker](#-deploy-with-docker) - [Deploy without Docker](#-cant-use-docker-ok-then-) - [Run with a Custom Port](#-run-with-a-custom-port) @@ -35,8 +36,24 @@ see a sample of the metrics page in [here](./extra/metrics.txt). ### Getting started +#### ⚙️ Deploy with Github Actions +- fork the repository. +- go to the fork repository and switch to `Action` tab. +- click the `I understand my workflows, go ahead and enable them` button. +- now you have access to all of the workflows, **however make sure you change the secrets listed below accordingly**: + 1. `secretes.DOCKER_TOKEN` : the personal access token docker hub of your(or your organization) account. + 2. `secretes.GHCR_TOKEN` : github classic access token with (packages read:write permissions) or just simply use `${{github.token}}`. [help](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) + +*here's how workflows work:* + - on push to `master` the project will be `built`, `deployed` and `released`. +*since deploying to your servers requires runner configuration it must be triggered manually, you can modify its behavior on `cd.yml` workflow.* + - on push to any branch **except for** `master` code will be `built` and `healthchecked` + - on pr the project will be `healthchecked` and `built`. + +*double check the required variables and secrets to prevent any unexpected failures* + #### 🐳 Deploy with Docker -- clone and enter the repository using the following commands: +- clone and checkout to the repository using the following commands: ```bash git clone https://github.com/Shayan-Ghani/Container-exporter.git cd Container-Exporter @@ -53,7 +70,6 @@ see a sample of the metrics page in [here](./extra/metrics.txt). # build from base with Dockerfile docker-compose -f container-exporter-local.yml up --build -d ``` -*alternatively, run `docker-compose -f container-exporter-local.yml up --build -d` to build from Dockerfile* #### 🐍 Can't use Docker? Ok then : ```bash @@ -83,12 +99,10 @@ Replace `` with the pid of ./start.sh script. #### 🚢 Run With A Custom Port: ```bash -./start.sh & -# or -CONTAINER_EXPORTER_PORT= docker-compose -f container-exporter.yml up -d +./start.sh & ``` -Change `` with a port of your choice and **make sure you change the port mapping in docker-compose accordingly.** +Change `` with a port of your choice. ### 🔥 Add CXP to Prometheus - Edit your `prometheus.yml` file and add the address of container-exporter in scrape_configs: @@ -128,4 +142,4 @@ Welcome to CXP! This project is currently in an experimental yet stable version, Feel free to contribute in any wacacy you can. If you come across a bug or have a suggestion, please don't hesitate to file an issue. Your input is valuable and helps us improve CXP for everyone; Therefore, add any desired function or feature to TO DO section. We appreciate your contribution to making CXP even better! If you have any questions or need assistance, feel free to reach out. Thank you! -- If you want to add metrics to cxp, make sure the naming convention is conformed to. (`container_metric_name`) +- If you want to add metrics to cxp, make sure the naming convention is conformed to. (`cxp_metric_name`) From 038c6941e5bf91fd0ea215e7f081f512e9732567 Mon Sep 17 00:00:00 2001 From: Shayan Ghani Date: Mon, 5 May 2025 01:23:57 +0330 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5fbf97..18edfdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,4 +19,14 @@ Version : 1.1.1 - `cxp_disk_io_read_bytes_total`: Total number of bytes read from disk - `cxp_disk_io_write_bytes_total`: Total number of bytes written to disk. - `cxp_network_rx_bytes_total`: Total number of bytes received over the network -- `cxp_network_tx_bytes_total`: Total number of bytes transmitted over the network \ No newline at end of file +- `cxp_network_tx_bytes_total`: Total number of bytes transmitted over the network + +# ChangeLog for CXP + +Version : 1.1.2-1.1.4 + +## Key points +- added Github actions deployment option +- this version makes the code more flexible against vunlerable dependency risks PRs. + +**check out README.MD, Deploy with Github Actions to make use of the new changes.** \ No newline at end of file From c158c195768c79b5598401ae1ec6878c1f04280a Mon Sep 17 00:00:00 2001 From: Shayan Ghani Date: Mon, 5 May 2025 01:44:36 +0330 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18edfdc..aef18bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,6 @@ Version : 1.1.2-1.1.4 ## Key points - added Github actions deployment option -- this version makes the code more flexible against vunlerable dependency risks PRs. +- this version makes the code more flexible against vulnerability dependency risks PRs. **check out README.MD, Deploy with Github Actions to make use of the new changes.** \ No newline at end of file