Skip to content

fix: Change query of usage metric #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2024
Merged

fix: Change query of usage metric #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 37 additions & 32 deletions operator/src/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,43 +173,48 @@ pub async fn run_metrics_collector(state: Arc<State>) {
last_execution = end;

let query = format!(
"sum by (user) (avg_over_time(pgbouncer_pools_client_active_connections{{user=~\"dmtr_.*\", namespace=\"{current_namespace}\"}}[{interval}s] @ {})) > 0",
"sum by (usename) (avg_over_time(pg_stat_activity_count{{usename=~\"dmtr_.*\", namespace=\"{current_namespace}\"}}[{interval}s] @ {})) > 0",
end.timestamp_millis() / 1000
);

let response = collect_prometheus_metrics(config, query).await;
if let Err(err) = response {
error!(error = err.to_string(), "error to make prometheus request");
state.metrics.metrics_failure(&err);
continue;
}
let response = response.unwrap();

for result in response.data.result {
let crd = crds
.iter()
.filter(|c| c.status.is_some())
.find(|c| c.status.as_ref().unwrap().username.eq(&result.metric.user));

if crd.is_none() {
warn!(user = result.metric.user, "username doesnt have a crd");
let response = match collect_prometheus_metrics(config, query).await {
Ok(response) => response,
Err(err) => {
error!(error = err.to_string(), "error to make prometheus request");
state.metrics.metrics_failure(&err);
continue;
}
};

let crd = crd.unwrap();

let dcu_per_second = config.dcu_per_second.get(&crd.spec.network);
if dcu_per_second.is_none() {
let error = Error::ConfigError(format!(
"dcu_per_second not configured to {} network",
&crd.spec.network
));
error!(error = error.to_string());
state.metrics.metrics_failure(&error);
continue;
}

let dcu_per_second = dcu_per_second.unwrap();
for result in response.data.result {
let crd = match crds.iter().filter(|c| c.status.is_some()).find(|c| {
c.status
.as_ref()
.unwrap()
.username
.eq(&result.metric.usename)
}) {
Some(crd) => crd,
None => {
if result.metric.usename != "dmtr_blockfrost" {
warn!(user = result.metric.usename, "username doesnt have a crd");
}
continue;
}
};

let dcu_per_second = match config.dcu_per_second.get(&crd.spec.network) {
Some(dcu_per_second) => dcu_per_second,
None => {
let error = Error::ConfigError(format!(
"dcu_per_second not configured to {} network",
&crd.spec.network
));
error!(error = error.to_string());
state.metrics.metrics_failure(&error);
continue;
}
};
let total_exec_time = result.value * (interval as f64);

let dcu = total_exec_time * dcu_per_second;
Expand Down Expand Up @@ -258,7 +263,7 @@ async fn collect_prometheus_metrics(

#[derive(Debug, Deserialize)]
struct PrometheusDataResultMetric {
user: String,
usename: String,
}

#[derive(Debug, Deserialize)]
Expand Down
Loading