Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
c745125f20 | |||
758fa7608f | |||
ee6b947f29 | |||
18dd1ef528 | |||
8fa7866cc2 | |||
238ad87119 | |||
d584e21fd9 | |||
ac79a2e0b7 | |||
1798c1270b | |||
97d1019b69 | |||
e30ceb75d9 | |||
4681e0c694 |
20
.github/workflows/build.yml
vendored
20
.github/workflows/build.yml
vendored
@@ -20,6 +20,8 @@ jobs:
|
|||||||
detect-project:
|
detect-project:
|
||||||
name: Detect Rust Project
|
name: Detect Rust Project
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
RUNNER_TOOL_CACHE: /toolcache
|
||||||
outputs:
|
outputs:
|
||||||
project-dir: ${{ steps.detect.outputs.project-dir }}
|
project-dir: ${{ steps.detect.outputs.project-dir }}
|
||||||
project-name: ${{ steps.detect.outputs.project-name }}
|
project-name: ${{ steps.detect.outputs.project-name }}
|
||||||
@@ -56,6 +58,8 @@ jobs:
|
|||||||
needs: [detect-project]
|
needs: [detect-project]
|
||||||
if: ${{ !failure() && !cancelled() }}
|
if: ${{ !failure() && !cancelled() }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
RUNNER_TOOL_CACHE: /toolcache
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
@@ -79,6 +83,8 @@ jobs:
|
|||||||
set-tag:
|
set-tag:
|
||||||
name: Set Tag Name
|
name: Set Tag Name
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
RUNNER_TOOL_CACHE: /toolcache
|
||||||
outputs:
|
outputs:
|
||||||
tag_name: ${{ steps.set_tag.outputs.tag_name }}
|
tag_name: ${{ steps.set_tag.outputs.tag_name }}
|
||||||
steps:
|
steps:
|
||||||
@@ -139,6 +145,8 @@ jobs:
|
|||||||
needs: [detect-project, test]
|
needs: [detect-project, test]
|
||||||
if: ${{ !failure() && !cancelled() }}
|
if: ${{ !failure() && !cancelled() }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
RUNNER_TOOL_CACHE: /toolcache
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
@@ -198,6 +206,8 @@ jobs:
|
|||||||
needs.build.result == 'success' &&
|
needs.build.result == 'success' &&
|
||||||
github.event_name != 'pull_request'
|
github.event_name != 'pull_request'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
RUNNER_TOOL_CACHE: /toolcache
|
||||||
environment: production
|
environment: production
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
@@ -233,10 +243,12 @@ jobs:
|
|||||||
tag:
|
tag:
|
||||||
name: Create Tag
|
name: Create Tag
|
||||||
needs: [docker-build, build, set-tag]
|
needs: [docker-build, build, set-tag]
|
||||||
if: |
|
#if: |
|
||||||
github.event_name == 'push' &&
|
# github.event_name == 'push' &&
|
||||||
needs.docker-build.result == 'success'
|
# needs.docker-build.result == 'success'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
RUNNER_TOOL_CACHE: /toolcache
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
@@ -257,7 +269,7 @@ jobs:
|
|||||||
|
|
||||||
summary:
|
summary:
|
||||||
name: Workflow Summary
|
name: Workflow Summary
|
||||||
needs: [test, audit, build, docker-build]
|
needs: [test, build, docker-build]
|
||||||
if: always()
|
if: always()
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
@@ -34,8 +34,8 @@ pub async fn get_available_container(docker: &Docker) -> Vec<DockerContainer> {
|
|||||||
container.id.as_ref()?; // Skip if no ID
|
container.id.as_ref()?; // Skip if no ID
|
||||||
|
|
||||||
let id = container.id?;
|
let id = container.id?;
|
||||||
let short_string_id = if id.len() > 12 { &id[..12] } else { &id };
|
let short_id = if id.len() > 12 { &id[..12] } else { &id };
|
||||||
let short_id: u32 = short_string_id.trim().parse().unwrap();
|
//let short_id: u32 = short_string_id.trim().parse().unwrap();
|
||||||
|
|
||||||
let name = container.names
|
let name = container.names
|
||||||
.and_then(|names| names.into_iter().next())
|
.and_then(|names| names.into_iter().next())
|
||||||
@@ -56,10 +56,10 @@ pub async fn get_available_container(docker: &Docker) -> Vec<DockerContainer> {
|
|||||||
})
|
})
|
||||||
.unwrap_or_else(|| "unknown".to_string());
|
.unwrap_or_else(|| "unknown".to_string());
|
||||||
|
|
||||||
println!(" - ID: {}, Image: {:?}, Name: {}", short_id, container.image, name);
|
println!(" - ID: {}, Image: {}, Name: {}", short_id, container.image.unwrap(), name);
|
||||||
|
|
||||||
Some(DockerContainer {
|
Some(DockerContainer {
|
||||||
ID: short_id,
|
ID: short_id.to_string(),
|
||||||
image,
|
image,
|
||||||
Name: name,
|
Name: name,
|
||||||
Status: status,
|
Status: status,
|
||||||
|
@@ -63,7 +63,7 @@ impl DockerContainer {
|
|||||||
///
|
///
|
||||||
/// # Returns
|
/// # Returns
|
||||||
/// * `Result<u32, Box<dyn Error + Send + Sync>>` - Container ID as integer.
|
/// * `Result<u32, Box<dyn Error + Send + Sync>>` - Container ID as integer.
|
||||||
pub async fn get_docker_container_id(container: DockerContainer) -> Result<u32, Box<dyn Error + Send + Sync>> {
|
pub async fn get_docker_container_id(container: DockerContainer) -> Result<String, Box<dyn Error + Send + Sync>> {
|
||||||
Ok(container.ID)
|
Ok(container.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -109,7 +109,7 @@ impl Collector {
|
|||||||
ram_load: hardware.memory.current_load.unwrap_or_default(),
|
ram_load: hardware.memory.current_load.unwrap_or_default(),
|
||||||
ram_size: hardware.memory.total_size.unwrap_or_default(),
|
ram_size: hardware.memory.total_size.unwrap_or_default(),
|
||||||
disk_size: hardware.disk.total_size.unwrap_or_default(),
|
disk_size: hardware.disk.total_size.unwrap_or_default(),
|
||||||
disk_usage: hardware.disk.total_used.unwrap_or_default(),
|
disk_usage: hardware.disk.total_usage.unwrap_or_default(),
|
||||||
disk_temp: 0.0, // not supported
|
disk_temp: 0.0, // not supported
|
||||||
net_rx: hardware.network.rx_rate.unwrap_or_default(),
|
net_rx: hardware.network.rx_rate.unwrap_or_default(),
|
||||||
net_tx: hardware.network.tx_rate.unwrap_or_default(),
|
net_tx: hardware.network.tx_rate.unwrap_or_default(),
|
||||||
|
@@ -187,7 +187,7 @@ pub struct Acknowledgment {
|
|||||||
/// - `_cpu_load`: CPU usage as a percentage (**0.0–100.0**)
|
/// - `_cpu_load`: CPU usage as a percentage (**0.0–100.0**)
|
||||||
#[derive(Debug, Serialize, Clone)]
|
#[derive(Debug, Serialize, Clone)]
|
||||||
pub struct DockerContainer {
|
pub struct DockerContainer {
|
||||||
pub ID: u32,
|
pub ID: String,
|
||||||
pub image: String,
|
pub image: String,
|
||||||
pub Name: String,
|
pub Name: String,
|
||||||
pub Status: String, // "running";"stopped";others
|
pub Status: String, // "running";"stopped";others
|
||||||
|
Reference in New Issue
Block a user