feat: add labels to NodeInfo
This commit is contained in:
@@ -16,20 +16,27 @@ ClusterManager cluster(ctx, taskManager);
|
||||
ApiServer apiServer(ctx, taskManager, ctx.config.api_server_port);
|
||||
|
||||
void setup() {
|
||||
// Setup WiFi first
|
||||
network.setupWiFi();
|
||||
// Setup WiFi first
|
||||
network.setupWiFi();
|
||||
|
||||
// Initialize and start all tasks
|
||||
taskManager.initialize();
|
||||
// Add example labels for this node
|
||||
auto it = ctx.memberList->find(ctx.hostname);
|
||||
if (it != ctx.memberList->end()) {
|
||||
it->second.labels["app"] = "base";
|
||||
it->second.labels["role"] = "demo";
|
||||
}
|
||||
|
||||
// Start the API server
|
||||
apiServer.begin();
|
||||
// Initialize and start all tasks
|
||||
taskManager.initialize();
|
||||
|
||||
// Print initial task status
|
||||
taskManager.printTaskStatus();
|
||||
// Start the API server
|
||||
apiServer.begin();
|
||||
|
||||
// Print initial task status
|
||||
taskManager.printTaskStatus();
|
||||
}
|
||||
|
||||
void loop() {
|
||||
taskManager.execute();
|
||||
yield();
|
||||
taskManager.execute();
|
||||
yield();
|
||||
}
|
||||
|
||||
@@ -349,6 +349,15 @@ NeoPixelService neoService(ctx, taskManager, NEOPIXEL_COUNT, NEOPIXEL_PIN, NEOPI
|
||||
void setup() {
|
||||
network.setupWiFi();
|
||||
|
||||
// Add example labels for this node
|
||||
auto it = ctx.memberList->find(ctx.hostname);
|
||||
if (it != ctx.memberList->end()) {
|
||||
it->second.labels["app"] = "neopixel";
|
||||
it->second.labels["device"] = "light";
|
||||
it->second.labels["pixels"] = String(NEOPIXEL_COUNT);
|
||||
it->second.labels["pin"] = String(NEOPIXEL_PIN);
|
||||
}
|
||||
|
||||
taskManager.initialize();
|
||||
|
||||
apiServer.begin();
|
||||
|
||||
@@ -107,6 +107,14 @@ void setup() {
|
||||
// Setup WiFi first
|
||||
network.setupWiFi();
|
||||
|
||||
// Add example labels for this node
|
||||
auto it = ctx.memberList->find(ctx.hostname);
|
||||
if (it != ctx.memberList->end()) {
|
||||
it->second.labels["app"] = "relay";
|
||||
it->second.labels["device"] = "actuator";
|
||||
it->second.labels["pin"] = String(RELAY_PIN);
|
||||
}
|
||||
|
||||
// Initialize and start all tasks
|
||||
taskManager.initialize();
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <IPAddress.h>
|
||||
#include <vector>
|
||||
#include <tuple>
|
||||
#include <map>
|
||||
|
||||
struct NodeInfo {
|
||||
String hostname;
|
||||
@@ -18,6 +19,7 @@ struct NodeInfo {
|
||||
} resources;
|
||||
unsigned long latency = 0; // ms since lastSeen
|
||||
std::vector<std::tuple<String, int>> apiEndpoints; // List of registered endpoints
|
||||
std::map<String, String> labels; // Arbitrary node labels (key -> value)
|
||||
};
|
||||
|
||||
const char* statusToStr(NodeInfo::Status status);
|
||||
|
||||
@@ -95,6 +95,16 @@ void ApiServer::onSystemStatusRequest(AsyncWebServerRequest *request) {
|
||||
apiObj["uri"] = std::get<0>(entry);
|
||||
apiObj["method"] = std::get<1>(entry);
|
||||
}
|
||||
// Include local node labels if present
|
||||
if (ctx.memberList) {
|
||||
auto it = ctx.memberList->find(ctx.hostname);
|
||||
if (it != ctx.memberList->end()) {
|
||||
JsonObject labelsObj = doc["labels"].to<JsonObject>();
|
||||
for (const auto& kv : it->second.labels) {
|
||||
labelsObj[kv.first.c_str()] = kv.second;
|
||||
}
|
||||
}
|
||||
}
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
request->send(200, "application/json", json);
|
||||
@@ -122,6 +132,13 @@ void ApiServer::onClusterMembersRequest(AsyncWebServerRequest *request) {
|
||||
apiObj["uri"] = std::get<0>(endpoint);
|
||||
methodToStr(endpoint, apiObj);
|
||||
}
|
||||
// Add labels if present
|
||||
if (!node.labels.empty()) {
|
||||
JsonObject labelsObj = obj["labels"].to<JsonObject>();
|
||||
for (const auto& kv : node.labels) {
|
||||
labelsObj[kv.first.c_str()] = kv.second;
|
||||
}
|
||||
}
|
||||
}
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
|
||||
@@ -118,6 +118,16 @@ void ClusterManager::fetchNodeInfo(const IPAddress& ip) {
|
||||
node.apiEndpoints.push_back(std::make_tuple(uri, method));
|
||||
}
|
||||
}
|
||||
// Parse labels if present
|
||||
node.labels.clear();
|
||||
if (doc["labels"].is<JsonObject>()) {
|
||||
JsonObject labelsObj = doc["labels"].as<JsonObject>();
|
||||
for (JsonPair kvp : labelsObj) {
|
||||
String k = String(kvp.key().c_str());
|
||||
String v = String(labelsObj[kvp.key()]);
|
||||
node.labels[k] = v;
|
||||
}
|
||||
}
|
||||
Serial.printf("[Cluster] Fetched info for node: %s @ %s\n", node.hostname.c_str(), ip.toString().c_str());
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -54,5 +54,7 @@ void NetworkManager::setupWiFi() {
|
||||
}
|
||||
self.lastSeen = millis();
|
||||
self.status = NodeInfo::ACTIVE;
|
||||
// Initialize a default label for demonstration; users can modify at runtime
|
||||
self.labels["hostname"] = ctx.hostname;
|
||||
ctx.fire("node_discovered", &self);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user