diff --git a/main.go b/main.go index 5407178..374a1a6 100644 --- a/main.go +++ b/main.go @@ -36,8 +36,11 @@ type OntCovidData struct { Records []struct { ID int `json:"_id"` ReportDate string `json:"report_date"` - PreviousDayDosesAdministered int `json:"previous_day_doses_administered"` + PreviousDayDosesAdministered int `json:"previous_day_total_doses_administered"` + PreviousDayAtLeastOne int `json:"previous_day_at_least_one"` + PreviousDayFullyVaccinated int `json:"previous_day_fully_vaccinated"` TotalDosesAdministered int `json:"total_doses_administered"` + TotalDosesAtLeastOne int `json:"total_individuals_at_least_one"` TotalDosesInFullyVaccinatedIndividuals int `json:"total_doses_in_fully_vaccinated_individuals"` TotalIndividualsFullyVaccinated int `json:"total_individuals_fully_vaccinated"` } `json:"records"` @@ -51,9 +54,12 @@ type OntCovidData struct { } var records struct { - TotalDosesAdministered func() prometheus.Gauge `name:"total_doses_administered" help:"Total doses administered"` PreviousDayDosesAdministered func() prometheus.Gauge `name:"previous_day_doses_administered" help:"Previous day doses administered"` - TotalDosesInFullyVaccinatedIndividuals func() prometheus.Gauge `name:"total_doses_in_fully_vaccinated_individuals" help:"Total doses in fully vaccinated individuals"` + PreviousDayAtLeastOne func() prometheus.Gauge `name:"previous_day_at_least_one" help:"Previous day doses administered at least one shot"` + PreviousDayFullyVaccinated func() prometheus.Gauge `name:"previous_day_fully_vaccinated" help:"Previous day doses administered fully vaccinated"` + TotalDosesAdministered func() prometheus.Gauge `name:"total_doses_administered" help:"Total doses administered"` + TotalDosesAtLeastOne func() prometheus.Gauge `name:"total_individuals_at_least_one" help:"Total at least one dose in individuals"` + TotalDosesInFullyVaccinatedIndividuals func() prometheus.Gauge `name:"total_doses_in_fully_vaccinated_individuals" help:"Total does in fully vaccinated individuals"` TotalIndividualsFullyVaccinated func() prometheus.Gauge `name:"total_individuals_fully_vaccinated" help:"Total individuals fully vaccinated"` EligiblePopulation func() prometheus.Gauge `name:"eligible_population" help:"Total population eligible for the vaccination"` } @@ -82,8 +88,12 @@ func updateMetrics() { return } - records.TotalDosesAdministered().Set(float64(data.Result.Records[0].TotalDosesAdministered)) + records.PreviousDayDosesAdministered().Set(float64(data.Result.Records[0].PreviousDayDosesAdministered)) + records.PreviousDayAtLeastOne().Set(float64(data.Result.Records[0].PreviousDayAtLeastOne)) + records.PreviousDayFullyVaccinated().Set(float64(data.Result.Records[0].PreviousDayFullyVaccinated)) + records.TotalDosesAdministered().Set(float64(data.Result.Records[0].TotalDosesAdministered)) + records.TotalDosesAtLeastOne().Set(float64(data.Result.Records[0].TotalDosesAtLeastOne)) records.TotalDosesInFullyVaccinatedIndividuals().Set(float64(data.Result.Records[0].TotalDosesInFullyVaccinatedIndividuals)) records.TotalIndividualsFullyVaccinated().Set(float64(data.Result.Records[0].TotalIndividualsFullyVaccinated)) records.EligiblePopulation().Set(float64(eligiblePopulation))