pie/twang-mp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add /metrics endpoint to be used with Prometheus

Browse Source
This commit is contained in:
Georg Gadinger
2019-10-10 20:18:17 +02:00
parent e46fe9e4d3
commit 6375c8e2c0
2 changed files with 147 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TWANG32/config.h
View File

@@ -64,6 +64,8 @@
#define MIN_REDRAW_INTERVAL 1000.0 / 60.0 // divide by frames per second..if you tweak adjust player speed #define MIN_REDRAW_INTERVAL 1000.0 / 60.0 // divide by frames per second..if you tweak adjust player speed
#endif #endif
// Comment or remove the next #define to disable the /metrics endpoint on the HTTP server.
// This endpoint provides the Twang32 stats for ingestion via Prometheus.
#define ENABLE_PROMETHEUS_METRICS_ENDPOINT
#endif #endif

70
TWANG32/wifi_ap.h
View File

@@ -9,11 +9,15 @@ WiFiServer server(80);
char linebuf[80]; char linebuf[80];
int charcount=0; int charcount=0;
enum PAGE_TO_SEND
{
Stats,
Metrics
};
void ap_setup() { void ap_setup() {
bool ret; bool ret;
/* /*
* Set up an access point * Set up an access point
* @param ssid Pointer to the SSID (max 63 char). * @param ssid Pointer to the SSID (max 63 char).
@@ -25,8 +29,6 @@ void ap_setup() {
//Serial.println("\r\nWiFi AP online ..."); //Serial.println("\r\nWiFi AP online ...");
server.begin(); server.begin();
} }
void sendStatsPage(WiFiClient client) { void sendStatsPage(WiFiClient client) {
@@ -40,7 +42,6 @@ void sendStatsPage(WiFiClient client) {
client.println("<h1>TWANG32 Play Stats</h1>"); client.println("<h1>TWANG32 Play Stats</h1>");
client.println("<ul>"); client.println("<ul>");
client.print("<li>Games played: "); client.print(user_settings.games_played); client.println("</li>"); client.print("<li>Games played: "); client.print(user_settings.games_played); client.println("</li>");
if (user_settings.games_played > 0) { // prevent divide by 0 if (user_settings.games_played > 0) { // prevent divide by 0
client.print("<li>Average score: "); client.print(user_settings.total_points / user_settings.games_played); client.println("</li>"); client.print("<li>Average score: "); client.print(user_settings.total_points / user_settings.games_played); client.println("</li>");
@@ -86,41 +87,76 @@ void sendStatsPage(WiFiClient client) {
client.print("</table>"); client.print("</table>");
#ifdef ENABLE_PROMETHEUS_METRICS_ENDPOINT
client.println("<ul><li><a href=\"/metrics\">Metrics</a></li></ul>");
#endif // ENABLE_PROMETHEUS_METRICS_ENDPOINT
client.println("</body>"); client.println("</body>");
client.println("</html>"); client.println("</html>");
client.println(); client.println();
} }
#ifdef ENABLE_PROMETHEUS_METRICS_ENDPOINT
// We need to use print() here since println() prints newlines as CR/LF, which
// Prometheus cannot handle.
#define __prom_metric(metric_name, metric_description, value) \
client.print("# HELP " metric_name " " metric_description "\n"); \
client.print("# TYPE " metric_name " gauge\n"); \
client.print(metric_name " "); \
client.print(value); \
client.print("\n");
static void sendMetricsPage(WiFiClient client)
{
client.println("HTTP/1.1 200 OK");
client.println("Content-Type: text/plain; charset=utf-8");
client.println("Server: twang_exporter");
client.println();
__prom_metric("twang_games_played", "Number of games played", user_settings.games_played);
__prom_metric("twang_total_points", "Total points", user_settings.total_points);
__prom_metric("twang_high_score", "High score", user_settings.high_score);
__prom_metric("twang_boss_kills", "Boss kills", user_settings.boss_kills);
}
#undef __prom_metric
#endif // ENABLE_PROMETHEUS_METRICS_ENDPOINT
void ap_client_check(){ void ap_client_check(){
int cnt; int cnt;
bool newconn=false; bool newconn=false;
int stat; int stat;
WiFiClient client = server.available(); // listen for incoming clients WiFiClient client = server.available(); // listen for incoming clients
//if (client) { // if you get a client,
// sendStatsPage(client);
// Serial.println("printUploadForm");
//}
bool currentLineIsBlank = true; bool currentLineIsBlank = true;
PAGE_TO_SEND page_to_send = Stats;
while (client.connected()) { while (client.connected()) {
if (client.available()) { if (client.available()) {
char c = client.read(); char c = client.read();
//Serial.write(c);
linebuf[charcount]=c; linebuf[charcount]=c;
if (charcount<sizeof(linebuf)-1) if (charcount<sizeof(linebuf)-1)
charcount++; charcount++;
if (c == '\n' && currentLineIsBlank) { if (c == '\n' && currentLineIsBlank)
{
switch (page_to_send)
{
case Stats:
sendStatsPage(client); sendStatsPage(client);
break; break;
#ifdef ENABLE_PROMETHEUS_METRICS_ENDPOINT
case Metrics:
sendMetricsPage(client);
break;
#endif // ENABLE_PROMETHEUS_METRICS_ENDPOINT
}
break;
} }
if (c == '\n') { if (c == '\n') {
// you're starting a new line // you're starting a new line
currentLineIsBlank = true; currentLineIsBlank = true;
if (strstr(linebuf,"GET /?") > 0) if (strstr(linebuf,"GET /?") > 0)
{ {
String line = String(linebuf); String line = String(linebuf);
@@ -136,8 +172,14 @@ void ap_client_check(){
change_setting(paramCode, val.toInt()); change_setting(paramCode, val.toInt());
page_to_send = Stats;
} }
#ifdef ENABLE_PROMETHEUS_METRICS_ENDPOINT
else if (strstr(linebuf, "GET /metrics"))
{
page_to_send = Metrics;
}
#endif // ENABLE_PROMETHEUS_METRICS_ENDPOINT
// you're starting a new line // you're starting a new line
currentLineIsBlank = true; currentLineIsBlank = true;
@@ -147,8 +189,6 @@ void ap_client_check(){
// you've gotten a character on the current line // you've gotten a character on the current line
currentLineIsBlank = false; currentLineIsBlank = false;
} }
} }
} }
} }