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
#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

210
TWANG32/wifi_ap.h
View File

@@ -1,7 +1,7 @@
#include <WiFi.h>
#include "settings.h"
const char* ssid = "TWANG_AP";
const char* ssid = "TWANG_AP";
const char* passphrase = "esp32rocks";
WiFiServer server(80);
@@ -9,44 +9,45 @@ WiFiServer server(80);
char linebuf[80];
int charcount=0;
enum PAGE_TO_SEND
{
Stats,
Metrics
};
void ap_setup() {
bool ret;
/*
* Set up an access point
* @param ssid Pointer to the SSID (max 63 char).
* @param passphrase (for WPA2 min 8 char, for open use NULL)
* @param channel WiFi channel number, 1 - 13.
* @param ssid_hidden Network cloaking (0 = broadcast SSID, 1 = hide SSID)
*/
ret = WiFi.softAP(ssid, passphrase, 2, 0);
//Serial.println("\r\nWiFi AP online ...");
server.begin();
bool ret;
/*
* Set up an access point
* @param ssid Pointer to the SSID (max 63 char).
* @param passphrase (for WPA2 min 8 char, for open use NULL)
* @param channel WiFi channel number, 1 - 13.
* @param ssid_hidden Network cloaking (0 = broadcast SSID, 1 = hide SSID)
*/
ret = WiFi.softAP(ssid, passphrase, 2, 0);
//Serial.println("\r\nWiFi AP online ...");
server.begin();
}
void sendStatsPage(WiFiClient client) {
// HTTP headers always start with a response code (e.g. HTTP/1.1 200 OK)
// and a content-type so the client knows what's coming, then a blank line:
client.println("HTTP/1.1 200 OK");
client.println("Content-type:text/html");
client.println();
client.println("<html>");
client.println("<body>");
client.println("<h1>TWANG32 Play Stats</h1>");
client.println("<ul>");
// HTTP headers always start with a response code (e.g. HTTP/1.1 200 OK)
// and a content-type so the client knows what's coming, then a blank line:
client.println("HTTP/1.1 200 OK");
client.println("Content-type:text/html");
client.println();
client.println("<html>");
client.println("<body>");
client.println("<h1>TWANG32 Play Stats</h1>");
client.println("<ul>");
client.print("<li>Games played: "); client.print(user_settings.games_played); client.println("</li>");
if (user_settings.games_played > 0) { // prevent divide by 0
client.print("<li>Games played: "); client.print(user_settings.games_played); client.println("</li>");
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>High score: "); client.print(user_settings.high_score); client.println("</li>");
client.print("<li>Boss kills: "); client.print(user_settings.boss_kills); client.println("</li>");
}
client.print("<li>High score: "); client.print(user_settings.high_score); client.println("</li>");
client.print("<li>Boss kills: "); client.print(user_settings.boss_kills); client.println("</li>");
client.print("<button onClick=\"location.href = 'http://192.168.4.1'\">Refresh</button>");
@@ -57,8 +58,8 @@ void sendStatsPage(WiFiClient client) {
client.print("<tr><td>");
client.print("LED Count (60-");
client.print(MAX_LEDS);
client.print(")</td><td><form><input type='number' name='C' value='");
client.print(MAX_LEDS);
client.print(")</td><td><form><input type='number' name='C' value='");
client.print(user_settings.led_count);
client.print ("' min='60' max='");
client.print (MAX_LEDS);
@@ -84,71 +85,110 @@ void sendStatsPage(WiFiClient client) {
client.print(user_settings.lives_per_level);
client.print("' min='3' max='9'><input type='submit'></form></td></tr>");
client.print("</table>");
client.print("</table>");
client.println("</body>");
client.println("</html>");
client.println();
#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("</html>");
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(){
int cnt;
bool newconn=false;
int stat;
WiFiClient client = server.available(); // listen for incoming clients
int cnt;
bool newconn=false;
int stat;
WiFiClient client = server.available(); // listen for incoming clients
//if (client) { // if you get a client,
// sendStatsPage(client);
// Serial.println("printUploadForm");
//}
bool currentLineIsBlank = true;
PAGE_TO_SEND page_to_send = Stats;
while (client.connected()) {
if (client.available()) {
char c = client.read();
//Serial.write(c);
linebuf[charcount]=c;
if (charcount<sizeof(linebuf)-1)
charcount++;
if (client.available()) {
char c = client.read();
linebuf[charcount]=c;
if (charcount<sizeof(linebuf)-1)
charcount++;
if (c == '\n' && currentLineIsBlank) {
if (c == '\n' && currentLineIsBlank)
{
switch (page_to_send)
{
case Stats:
sendStatsPage(client);
break;
#ifdef ENABLE_PROMETHEUS_METRICS_ENDPOINT
case Metrics:
sendMetricsPage(client);
break;
#endif // ENABLE_PROMETHEUS_METRICS_ENDPOINT
}
if (c == '\n') {
// you're starting a new line
currentLineIsBlank = true;
if (strstr(linebuf,"GET /?") > 0)
{
String line = String(linebuf);
int start = line.indexOf('=', 0);
char paramCode = line.charAt(start - 1);
int finish = line.indexOf('H', start+1)-1;
String val = line.substring(start+1, finish);
// if it is not numeric, it will convert to 0.
// The the change_setting function will make sure the range is OK
change_setting(paramCode, val.toInt());
}
// you're starting a new line
currentLineIsBlank = true;
memset(linebuf,0,sizeof(linebuf));
charcount=0;
} else if (c != '\r') {
// you've gotten a character on the current line
currentLineIsBlank = false;
}
break;
}
}
if (c == '\n') {
// you're starting a new line
currentLineIsBlank = true;
if (strstr(linebuf,"GET /?") > 0)
{
String line = String(linebuf);
int start = line.indexOf('=', 0);
char paramCode = line.charAt(start - 1);
int finish = line.indexOf('H', start+1)-1;
String val = line.substring(start+1, finish);
// if it is not numeric, it will convert to 0.
// The the change_setting function will make sure the range is OK
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
currentLineIsBlank = true;
memset(linebuf,0,sizeof(linebuf));
charcount=0;
} else if (c != '\r') {
// you've gotten a character on the current line
currentLineIsBlank = false;
}
}
}
}