Telecominfraproject/wlan-cloud-analytics
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-analytics.git synced 2026-01-27 10:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding WifiClientHistory.

Browse Source
This commit is contained in:
stephb9959
2022-05-15 21:58:01 -07:00
parent a8d2e39e16
commit 0e9e465be6
5 changed files with 5 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/APStats.cpp
View File

@@ -97,7 +97,6 @@ namespace OpenWifi {
// find radios first to get associations.
try {
std::cout << __LINE__ << std::endl;
if(State->contains("unit")) {
auto unit = (*State)["unit"];
GetJSON("localtime", unit, DI_.lastState, (uint64_t) 0);
@@ -115,43 +114,26 @@ namespace OpenWifi {
}
}
std::cout << __LINE__ << std::endl;
DTP.timestamp = DI_.lastState;
std::map<uint, std::pair<uint,uint> > radio_map;
if(State->contains("radios") && (*State)["radios"].is_array()) {
std::cout << __LINE__ << std::endl;
auto radios = (*State)["radios"];
uint radio_index = 0;
for (const auto &radio: radios) {
std::cout << __LINE__ << std::endl;
if (radio.contains("channel")) {
std::cout << __LINE__ << std::endl;
AnalyticsObjects::RadioTimePoint RTP;
std::cout << __LINE__ << std::endl;
GetJSON("channel", radio, RTP.channel, (uint64_t) 2);
std::cout << __LINE__ << std::endl;
RTP.band = RTP.channel <= 16 ? 2 : 5;
std::cout << __LINE__ << std::endl;
radio_map[radio_index++] = std::make_pair(RTP.band, RTP.channel);
std::cout << __LINE__ << std::endl;
GetJSON("busy_ms", radio, RTP.busy_ms, (uint64_t) 0);
std::cout << __LINE__ << std::endl;
GetJSON("receive_ms", radio, RTP.receive_ms, (uint64_t) 0);
std::cout << __LINE__ << std::endl;
GetJSON("transmit_ms", radio, RTP.transmit_ms, (uint64_t) 0);
std::cout << __LINE__ << std::endl;
GetJSON("active_ms", radio, RTP.active_ms, (uint64_t) 0);
std::cout << __LINE__ << std::endl;
GetJSON("tx_power", radio, RTP.tx_power, (uint64_t) 0);
std::cout << __LINE__ << std::endl;
GetJSON("active_ms", radio, RTP.active_ms, (uint64_t) 0);
std::cout << __LINE__ << std::endl;
GetJSON("channel", radio, RTP.channel, (uint64_t) 0);
std::cout << __LINE__ << std::endl;
GetJSON("temperature", radio, RTP.temperature, (int64_t) 20);
std::cout << __LINE__ << std::endl;
if (radio.contains("channel_width") && !radio["channel_width"].is_null()) {
if(radio["channel_width"].is_string()) {
std::string C = radio["channel_width"];
@@ -162,12 +144,9 @@ namespace OpenWifi {
RTP.channel_width = 20;
}
}
std::cout << __LINE__ << std::endl;
if(RTP.temperature==0)
RTP.temperature = 20;
std::cout << __LINE__ << std::endl;
GetJSON("noise", radio, RTP.noise, (int64_t) -90);
std::cout << __LINE__ << std::endl;
if(RTP.noise==0)
RTP.noise=-90;
DTP.radio_data.push_back(RTP);
@@ -175,15 +154,11 @@ namespace OpenWifi {
}
}
std::cout << __LINE__ << std::endl;
// now that we know the radio bands, look for associations
auto interfaces = (*State)["interfaces"];
DI_.associations_2g = DI_.associations_5g = DI_.associations_6g = 0;
for(const auto &interface:interfaces) {
std::cout << __LINE__ << std::endl;
if(interface.contains("counters")) {
std::cout << __LINE__ << std::endl;
auto counters = interface["counters"];
GetJSON("collisions", counters, DTP.ap_data.collisions, (uint64_t) 0);
GetJSON("multicast", counters, DTP.ap_data.multicast, (uint64_t) 0);
@@ -197,37 +172,29 @@ namespace OpenWifi {
GetJSON("tx_packets", counters, DTP.ap_data.tx_packets, (uint64_t) 0);
}
std::cout << __LINE__ << std::endl;
if(interface.contains("ssids")) {
auto ssids = interface["ssids"];
for (const auto &ssid: ssids) {
std::cout << __LINE__ << std::endl;
AnalyticsObjects::SSIDTimePoint SSIDTP;
uint radio_location=0;
SSIDTP.band = 2;
if(ssid.contains("radio")) {
std::cout << __LINE__ << std::endl;
auto radio = ssid["radio"];
if(radio.contains("$ref")) {
std::cout << __LINE__ << std::endl;
auto ref = radio["$ref"];
auto radio_parts = Poco::StringTokenizer(ref, "/");
if(radio_parts.count()==3) {
std::cout << __LINE__ << std::endl;
radio_location = std::strtol(radio_parts[2].c_str(), nullptr, 10);
if(radio_map.find(radio_location)!=radio_map.end()) {
std::cout << __LINE__ << std::endl;
SSIDTP.band = radio_map[radio_location].first;
SSIDTP.channel = radio_map[radio_location].second;
}
}
}
}
std::cout << __LINE__ << std::endl;
GetJSON("bssid",ssid,SSIDTP.bssid, std::string{""});
GetJSON("mode",ssid,SSIDTP.mode, std::string{""} );
GetJSON("ssid",ssid,SSIDTP.ssid, std::string{""} );
std::cout << __LINE__ << std::endl;
if (ssid.contains("associations") && ssid["associations"].is_array()) {
auto associations = ssid["associations"];
auto radio_it = radio_map.find(radio_location);
@@ -240,10 +207,7 @@ namespace OpenWifi {
else if (the_radio == 6)
DI_.associations_6g += associations.size();
}
std::cout << __LINE__ << std::endl;
for(const auto &association:associations) {
std::cout << __LINE__ << std::endl;
AnalyticsObjects::UETimePoint TP;
GetJSON("station",association,TP.station, std::string{} );
GetJSON("rssi",association,TP.rssi, (int64_t)0 );
@@ -259,7 +223,6 @@ namespace OpenWifi {
AnalyticsObjects::WifiClientHistory WFH;
WFH.station_id = mac_filter(TP.station);
std::cout << "Adding WiFiClient: " << WFH.station_id << std::endl;
WFH.bssid = mac_filter(SSIDTP.bssid);
WFH.ssid = SSIDTP.ssid;
WFH.rssi = TP.rssi;
@@ -280,7 +243,6 @@ namespace OpenWifi {
GetJSON("rx_packets",association,WFH.rx_packets,(uint64_t)0);
GetJSON("tx_packets",association,WFH.tx_packets,(uint64_t)0);
std::cout << __LINE__ << std::endl;
WFH.ipv4 = "---";
WFH.ipv6 = "----";
@@ -304,11 +266,8 @@ namespace OpenWifi {
GetJSON("inactive",association,WFH.inactive,(uint64_t)0);
GetJSON("tx_retries",association,WFH.tx_retries,(uint64_t)0);
std::cout << "Adding WiFiClient: " << WFH.station_id << std::endl;
WifiClientCache()->AddSerialNumber(venue_id_,WFH.station_id);
StorageService()->WifiClientHistoryDB().CreateRecord(WFH);
std::cout << __LINE__ << std::endl;
if(association.contains("tid_stats") && association["tid_stats"].is_array()) {
auto tid_stats = association["tid_stats"];
@@ -322,7 +281,6 @@ namespace OpenWifi {
}
}
std::cout << __LINE__ << std::endl;
if(association.contains("tx_rate")) {
auto tx_rate = association["tx_rate"];
GetJSON("bitrate",tx_rate,TP.tx_rate.bitrate, (uint64_t)0 );

1
src/APStats.h
View File

@@ -18,6 +18,7 @@ namespace OpenWifi {
boardId_(BoardId),
Logger_(L)
{
std::cout << "Ap Venue: " << venue_id_ << std::endl;
DI_.serialNumber = Utils::IntToSerialNumber(mac);
}

2
src/VenueCoordinator.cpp
View File

@@ -96,7 +96,7 @@ namespace OpenWifi {
ExistingBoards_[B.info.id] = Devices;
Watchers_[B.info.id] = std::make_shared<VenueWatcher>(B.info.id, B.venueList[0].id, Logger(), Devices);
Watchers_[B.info.id]->Start();
Logger().information(fmt::format("Started board {}", B.info.name));
Logger().information(fmt::format("Started board {} for venue {}", B.info.name,B.venueList[0].id ));
return true;
}

1
src/VenueWatcher.h
View File

@@ -40,6 +40,7 @@ namespace OpenWifi {
venue_id_(venue_id),
Logger_(L),
SerialNumbers_(SerialNumbers) {
std::cout << "VenueWatcher: " << venue_id_ << std::endl;
std::sort(SerialNumbers_.begin(),SerialNumbers_.end());
auto last = std::unique(SerialNumbers_.begin(),SerialNumbers_.end());
SerialNumbers_.erase(last,SerialNumbers_.end());

4
test_scripts/curl/cli
View File

@@ -279,7 +279,7 @@ pointstats() {
}
wificlientsonly() {
curl ${FLAGS} -X GET "https://${OWANALYTICS}/api/v1/wifiClientHistory?macsOnly=true&macFilter=$1" \
curl ${FLAGS} -X GET "https://${OWANALYTICS}/api/v1/wifiClientHistory?macsOnly=true&macFilter=$2&venue=$1" \
-H "Accept: application/json" \
-H "Content-Type: application/json" \
-H "Authorization: Bearer ${token}" > ${result_file}
@@ -304,7 +304,7 @@ case "$1" in
"boardsforvenue") login; boardsforvenue $2; logout;;
"points") login; points $2; logout;;
"pointstats") login; pointstats $2; logout;;
"wificlientsonly") login; wificlientsonly $2; logout;;
"wificlientsonly") login; wificlientsonly $2 $3; logout;;
*) help ;;
esac