Skip to content

Commit

Permalink
Fixing #2 Warnings during import
Browse files Browse the repository at this point in the history
* Warnings issue when attempting to import a Slowlog from the CLI
* Clean up CHANGELOG.md
  • Loading branch information
TheWitness committed Feb 25, 2023
1 parent 12306f7 commit 39c5a02
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
26 changes: 15 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
## Changelog
## ChangeLog

--- develop ---

feature: Allow summarizing the Details page by method and by table
feature: Add Time-span selector to details page
feature: Switch from Billboard.js to ApexCharts due to lack of feature support in Billboard.js
* issue#2: Warnings issue when attempting to import a Slowlog from the CLI
* feature: Allow summarizing the Details page by method and by table
* feature: Add Time-span selector to details page
* feature: Switch from Billboard.js to ApexCharts due to lack of feature support in Billboard.js

--- 2.0 ---

feature: Compatibility with Cacti 1.2.x
feature: Faster slowlog post-processing
feature: Move from flash charts to Billboard.js
* feature: Compatibility with Cacti 1.2.x
* feature: Faster slowlog post-processing
* feature: Move from flash charts to Billboard.js

--- 1.3 ---
feature: Allow the use of the local Cacti Database as Prototype

* feature: Allow the use of the local Cacti Database as Prototype

--- 1.2 ---
bug: Pagination and 'clear' filters not working as expected when filter dropdowns change
bug: Pasting lists from Linux does not show tables on the table side

* bug: Pagination and 'clear' filters not working as expected when filter dropdowns change
* bug: Pasting lists from Linux does not show tables on the table side

--- 1.0 ---
Initial release

* Initial release
6 changes: 5 additions & 1 deletion slowlog_functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,11 @@ function import_logfile($logfile, $description = 'Imported using import_log util
$query = '';
$oquery = '';
$p1 = explode(' ', $l);
$date = '20' . substr($p1[2], 0, 2) . '-' . substr($p1[2], 2, 2) . '-' . substr($p1[2], 4, 2) . ' ' . $p1[3];
$date = '20' .
substr($p1[2], 0, 2) . '-' .
substr($p1[2], 2, 2) . '-' .
substr($p1[2], 4, 2) .
(isset($p1[3]) ? ' ' . $p1[3]:'');

if ($start_time == 0) {
$start_time = $date;
Expand Down

0 comments on commit 39c5a02

Please sign in to comment.