Commit graph

127 commits

Author SHA1 Message Date
Thulinma
b6d879369f Added JSON instrumentation output. 2016-04-22 16:17:28 +02:00
Thulinma
dd46788d37 Support for text-based prometheus-compatible instrumentation. 2016-04-22 16:17:28 +02:00
Thulinma
0a8b8e40d8 Merge branch 'development' into LTS_development 2016-04-15 13:47:42 +02:00
Thulinma
9239586a89 Added cpu_use response to capabilities API call 2016-04-15 13:47:35 +02:00
Thulinma
a3a40dbf17 Fix stats not disappearing 2016-04-14 16:32:17 +02:00
Thulinma
c548077282 Made fillActive calls (stats_streams and current_streams) only count users that have retrieved at least 128KiB of data, in order to filter out index and meta requests. 2016-04-14 12:39:20 +02:00
Thulinma
230772f125 fillActive now 15 seconds delayed as opposed to 2 seconds delayed, for more accurate viewer counts. 2016-04-13 15:20:23 +02:00
Thulinma
2029b35361 Tweaked fillActive to have both now and historic modes
Made streams no longer show as active for ~10m after being active.
2016-02-29 13:25:19 +01:00
Thulinma
99b5b8361d Merge branch 'development' into LTS_development 2016-02-29 13:20:52 +01:00
Thulinma
77a6315dfb Wipe sessions when they expire. 2016-02-29 13:16:58 +01:00
Thulinma
f6e2e95b5a Added USER_NEW trigger. 2016-02-19 11:33:40 +01:00
Thulinma
22467d603e Added support for clients and lastms requests in active_streams API call 2015-11-27 10:44:21 +01:00
Thulinma
74c8932106 Merge branch 'development' into json_mod_LTS
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
2015-10-07 11:05:49 +02:00
Thulinma
16d38459b6 Made JSON library non-recursive.
Co-authored with Diederick.
2015-10-06 13:21:14 +02:00
Thulinma
c9a30c2816 Improved on/off display for streams. 2015-09-29 11:03:26 +02:00
Thulinma
4bdbd82f66 LTS Commits 2015-04-05 21:38:36 +02:00
Erik Zandvliet
d370ef4eac Working multi-input 2015-04-02 09:56:47 +02:00
Thulinma
a001feafca Fixed various live issues. 2014-12-30 02:08:14 +01:00
Thulinma
55046206fe Fixed various statistics bugs. 2014-12-05 21:31:45 +01:00
Thulinma
63c4e5d1e6 New statistics code with sessions. 2014-11-28 16:30:35 +01:00
Thulinma
b325ca96ee Added checksum to stats of HTTP based outputs for later merging of connections. 2014-10-23 15:12:33 +02:00
Thulinma
c26661b690 Fixed hostname in statistics to properly be in packed binary format, internally. 2014-10-22 16:51:51 +02:00
Thulinma
c927170ea2 Fixes to current client stats when timeouts were occurring. 2014-09-10 18:30:30 +02:00
Thulinma
7f1c2f28aa Various and sundry fixes. 2014-06-20 19:07:13 +02:00
Thulinma
840cfaabed Added support for arrays of requests in totals/clients API calls. 2014-06-11 17:58:49 +02:00
Thulinma
6ade063756 Added API documentation, updated doxygen configuration. 2014-05-02 12:19:54 +02:00
Thulinma
cd2fe225c5 Shared memory rewrite 2014-04-04 19:50:40 +02:00