Commit graph

85 commits

Author SHA1 Message Date
emanuele-f
8a8a016283 Replace lua_pushnumber with lua_pushinteger where necessary.
Lua 5.3 now supports 64bit integers. Using a number instead of an integer can cause problems since
tostring adds the decimal dot:
	- Lua 5.2: tostring(5.0) = "5"
	- Lua 5.3: tostring(5.0) = "5.0"
2018-11-29 15:36:19 +01:00
Simone Mainardi
859e85c7ce Fixes C to Lua integer types conversions affecting OS X 2018-11-23 15:58:38 +01:00
Simone Mainardi
d62a19fa88 Adds time to sql query log 2018-08-16 09:48:30 +02:00
Simone Mainardi
cd6c7c4338 Adds SQL queries log performed from Lua 2018-08-13 19:27:00 +02:00
Simone Mainardi
db5aabb611 Prevents large MySQL exports that could cause Lua OOMs 2018-08-10 15:50:28 +02:00
Luca Deri
f0c936c368 Updated (C) to 2018 2018-03-22 21:59:42 +01:00
Luca Deri
1bae7157f4 Added missing flow export call 2018-02-15 15:26:19 +01:00
Luca Deri
7fd73b1026 Minor 2017-12-14 23:49:44 +01:00
Luca
b350ecc7d9 Minor rework in periodic scripts
Reworked aggregated DB dump
2017-11-12 12:10:20 +01:00
Luca Deri
c8de202017 Fixes to compile ntopng without MySQL
Added nEdge support in configure
2017-10-21 13:39:18 +02:00
andrewmv
c1f87f722b Add support for custom mysql port (#1501)
* Add support for custom mysql port

- Fixed port number parsing from startup arguments
  as documented in man page.
- Added port number usage to --help.
- Added port number to error messaging.

* Added support for custom mysql port

Corrected omissions in previous commit
- Fixed port number parsing from startup arguments
  as documented in man page.
- Added port number usage to --help.
- Added port number to error messaging.

* Add support for custom mysql port

Corrected build errors in previous commit
- Fixed port number parsing from startup arguments
as documented in man page.
- Added port number usage to --help.
- Added port number to error messaging.

* Rewrote logic to be C++98 compatible
2017-10-10 10:10:56 +02:00
Simone Mainardi
a86f3dd36e Implements DB interoperability b/w ntopng and nProbe 2017-08-11 16:51:10 +02:00
Simone Mainardi
e4182969c4 Fixes some memory leaks
Possibly affects #1351 #1345 #1337 #1311
2017-07-10 18:39:19 +02:00
Simone Mainardi
e6e8a7e626 Fixes MySQL data too long error 2017-06-05 12:02:18 +02:00
Simone Mainardi
d7b929bdc1 Implements DNS searches and reworks INFO column 2017-05-23 14:00:19 +02:00
Simone Mainardi
1b313d2932 Implements periodic flow aggregation 2017-05-09 15:07:20 +02:00
Simone Mainardi
b238191bd7 Implements flows pre-aggregation 2017-05-06 22:10:56 +02:00
Simone Mainardi
0c1fd6071f Defines some MySQL constants 2017-04-20 16:46:01 +02:00
Campus
5f63a808f8 change from protocol to app_protocol to sync with ndpi commit 5de6a96af5754c13846883b556f58fc79831c61d 2017-03-15 18:19:40 +01:00
Josh Soref
3c51178e68 spelling: query 2017-03-07 07:40:13 +00:00
Josh Soref
78e78c018c Fixes spellings and typos
Thank goes to
Josh Soref <jsoref@users.noreply.github.com>
2017-03-06 17:54:48 +01:00
Luca Deri
941e5d3f0f Reworked Flashstart to avoid using the redis cache
Reorganized code
2017-01-31 19:23:18 +01:00
Luca
30e1a75f98 (C) update 2017-01-10 15:03:16 -08:00
Simone Mainardi
b6eb667890 Visualizes database processes list when the DB is not ready
Implements #891
2017-01-09 16:58:17 +01:00
Luca
f50f61f9fc MySQL DB improvements
Cached slack preference
Optimized DHCP cache read
2016-12-28 19:20:06 +01:00
Simone Mainardi
ff7c61bb9d Fixes an issue when dumping flows already partially dumped
The final dump for flows partially dumped could be, under certain
conditions, skipped. This commit addresses the issue.

Fixes #846
2016-12-21 19:44:47 +01:00
Simone Mainardi
482c2ca834 Implements counter resets
This commits adds two reset buttons to the interface page.

One button allows the reset of all interface counters, namely,
packets and bytes received, packets dropped, and the number of
flows exported and dropped (when mysql or elasticsearch is enabled).

The other button allows the reset of only the drops.
2016-12-21 12:48:04 +01:00
Simone Mainardi
e1b20e5f9b MySQLDB::flow2InsertValues returns flow len 2016-12-19 15:34:06 +01:00
Simone Mainardi
ea61e51643 Prevents queryLoop termination upon failing DB connection attempts
Fixes #851
2016-12-16 20:11:51 +01:00
Simone Mainardi
5ded07f5a8 Adds code for batched mysql insertions 2016-12-15 22:53:23 +01:00
Simone Mainardi
449c718208 Generalizes Mysql insert into inside defines 2016-12-15 22:53:22 +01:00
Luca Deri
6bd1fee5f2 Fix for #751 2016-09-17 10:15:11 +02:00
Simone Mainardi
e34d7806f1 Improves MySQL errors detection
Fixes #733
2016-09-13 11:08:42 +02:00
Simone Mainardi
bca1e0a126 Implements MySQL flow export statistics 2016-08-29 09:41:55 +02:00
Simone Mainardi
e8707bcaa9 Implements counters for export dropped flows (wip)
ntopng optionally exports flows to MySQL or ES. This change
keeps track of possible drops (e.g., due to a slow mysql server)
and shows them to the user.
2016-08-26 19:27:46 +02:00
Luca Deri
5692565ac6 Fix for queries that do not return results but that were reported as errors 2016-07-13 14:23:20 +02:00
Luca Deri
0b26aa9b0f Fixed broken icon in waiting page
Oreliminary work to detect future enterprise edition
Minor change in MySQL error report
2016-07-12 00:31:43 +02:00
Simone Mainardi
2d2e735c99 Makes MySQL counter columns unsigned
Fixes #643
2016-07-08 17:55:06 +02:00
Simone Mainardi
a51994cfec Implements asynchronous database schema updates
Database updates are now performed asynchronously.
The web server starts but notifies the user with a
'please wait' message until the updates are completed.
2016-07-04 19:37:44 +02:00
Luca Deri
9095bcdaa0 Fixed invalid MySQL initialization 2016-07-04 09:28:22 +02:00
Simone Mainardi
e1730f2953 Migrates MySQL tables engine to MyISAM
In non-transactional environments MyISAM is preferred over InnoDB as
it is faster. This commits convert existing InnoDB tables to MySIAM,
notifying the user about the change:

26/Jun/2016 14:01:36 [MySQLDB.cpp:324] MySQL schema update. Altering
table flowsv4: changing engine from InnoDB to MyISAM.
26/Jun/2016 14:01:51 [MySQLDB.cpp:324] MySQL schema update. Altering
table flowsv6: changing engine from InnoDB to MyISAM.
2016-06-26 14:03:11 +02:00
Simone Mainardi
9953cc2328 Implements IN_BYTES/OUT_BYTES in historical data
MySQL schema change has been implemented together with
new historical talkers.
TODO: historical protocols.
2016-05-24 11:08:11 +02:00
Simone Mainardi
9eb7b7ab65 Prevents possible MySQL errors caused by long queries
Maximum query size has been raised from 2048 to the hardcoded
constant CONST_MAX_SQL_QUERY_LEN that is currently equal
to 8192.

A warning message is generated when attempting to execute
queries longer than the maximum allowed values that would
be truncated.

Fixes #511
2016-04-20 14:45:57 +02:00
Simone Mainardi
59d427841d Fixes possible duplicated flow dumps 2016-03-29 14:34:06 +02:00
Luca Deri
0aa87b7c9b Spring cleaning 2016-03-28 14:16:27 +02:00
Luca Deri
99668c736d Merge branch 'dev' of https://github.com/ntop/ntopng into dev
Conflicts:
	src/MySQLDB.cpp
2016-03-26 22:57:01 +01:00
Luca Deri
fac51e9fca Reworked MySQL interface 2016-03-26 22:52:54 +01:00
Simone Mainardi
63b09fc516 Prevents insertion of queries longer than max allowed size 2016-03-26 22:46:42 +01:00
Simone Mainardi
a707d9a880 Flushes flow queues when migrating between MySQL formats 2016-03-26 22:24:19 +01:00
Luca Deri
ef6fdebf63 Fixes in MySQl batch 2016-03-26 22:00:56 +01:00