From 2408a26e1ecbbe87ea48cecb93f692c97f0f8a92 Mon Sep 17 00:00:00 2001 From: luiscarlosjp Date: Thu, 5 Mar 2026 17:44:16 -0300 Subject: [PATCH] feat: adiciona total de chamados hoje --- .../dashboards/monitoring-dashboard.json | 6 ++-- src/app.py | 2 +- src/data_formatter.py | 28 +++++++++++++++---- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/grafana/provisioning/dashboards/monitoring-dashboard.json b/grafana/provisioning/dashboards/monitoring-dashboard.json index 59fe17e..594abdd 100644 --- a/grafana/provisioning/dashboards/monitoring-dashboard.json +++ b/grafana/provisioning/dashboards/monitoring-dashboard.json @@ -109,7 +109,7 @@ "refId": "A" } ], - "title": "Chamados em vigor", + "title": "Em Aberto", "type": "stat" }, { @@ -169,13 +169,13 @@ "type": "prometheus", "uid": "PBFA97CFB590B2093" }, - "expr": "chamados_abertos_hoje", + "expr": "chamados_total_hoje", "format": "time_series", "instant": true, "refId": "A" } ], - "title": "Chamados Abertos Hoje", + "title": "Total de Chamados Hoje", "type": "stat" }, { diff --git a/src/app.py b/src/app.py index 8008c4b..7efbc9b 100644 --- a/src/app.py +++ b/src/app.py @@ -246,7 +246,7 @@ def summary(): @app.route('/api/dashboard-resume') def dashboard_resume(): """ - Get dashboard resume with today's opened tickets, month tickets, and closed tickets + Get dashboard resume with today's total tickets, month tickets, and closed tickets """ try: client = APIClient() diff --git a/src/data_formatter.py b/src/data_formatter.py index b2bc295..222cb4b 100644 --- a/src/data_formatter.py +++ b/src/data_formatter.py @@ -235,13 +235,23 @@ class DataFormatter: # Dashboard resume metrics if resume_today or resume_month: - chamados_abertos = (resume_today.get('open', 0) if resume_today else 0) chamados_mes = (resume_month.get('total', 0) if resume_month else 0) chamados_concluidos = (resume_today.get('closed', 0) if resume_today else 0) + chamados_total_hoje = 0 + + if resume_today: + chamados_total_hoje = resume_today.get('total') + if chamados_total_hoje is None: + chamados_total_hoje = resume_today.get('open', 0) + resume_today.get('closed', 0) - metrics.append("# HELP chamados_abertos_hoje Number of tickets currently open") + metrics.append("# HELP chamados_total_hoje Total tickets created today") + metrics.append("# TYPE chamados_total_hoje gauge") + metrics.append(f"chamados_total_hoje {chamados_total_hoje}") + + # Keep legacy metric name as an alias for existing dashboards. + metrics.append("\n# HELP chamados_abertos_hoje Deprecated alias for chamados_total_hoje") metrics.append("# TYPE chamados_abertos_hoje gauge") - metrics.append(f"chamados_abertos_hoje {chamados_abertos}") + metrics.append(f"chamados_abertos_hoje {chamados_total_hoje}") metrics.append("\n# HELP chamados_total Total number of open tickets") metrics.append("# TYPE chamados_total gauge") @@ -352,14 +362,19 @@ class DataFormatter: """ if not resume_today and not resume_month: return { + 'chamados_total_hoje': 0, 'chamados_abertos_hoje': 0, 'chamados_do_mes': 0, 'chamados_concluidos': 0, 'timestamp': datetime.now().isoformat() } - # Chamados abertos hoje = tickets que estão abertos/em atendimento agora - chamados_abertos = (resume_today.get('open', 0) if resume_today else 0) + # Total de chamados hoje = total do periodo (hoje). Fallback para open + closed. + chamados_total_hoje = 0 + if resume_today: + chamados_total_hoje = resume_today.get('total') + if chamados_total_hoje is None: + chamados_total_hoje = resume_today.get('open', 0) + resume_today.get('closed', 0) # Chamados do mês = total de tickets criados no mês chamados_mes = (resume_month.get('total', 0) if resume_month else 0) @@ -368,7 +383,8 @@ class DataFormatter: chamados_concluidos = (resume_today.get('closed', 0) if resume_today else 0) return { - 'chamados_abertos_hoje': chamados_abertos, + 'chamados_total_hoje': chamados_total_hoje, + 'chamados_abertos_hoje': chamados_total_hoje, 'chamados_do_mes': chamados_mes, 'chamados_concluidos': chamados_concluidos, 'timestamp': datetime.now().isoformat()