Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show all available data points in the Total queries over last 24 hours graph #2195

Merged
merged 1 commit into from
May 1, 2022

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented May 1, 2022

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:

See title.

How does this PR accomplish the above?:

Only remove last data point for line charts as it is not representative there.

What documentation changes (if any) are needed to support this PR?:

None

…ve there

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team May 1, 2022 13:20
@yubiuser yubiuser merged commit 63a87dc into devel May 1, 2022
@yubiuser yubiuser deleted the tweak/overtime branch May 1, 2022 14:59
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-ftl-v5-16-web-v5-13-and-core-v5-11-1-released/56384/1

arevindh added a commit to arevindh/AdminLTE that referenced this pull request Jul 9, 2022
* Using the correct dimensions

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add content type header

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add codespell.yml

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Fix some suggestions / ignore others

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Allow delete multiple items - Group pages

- add checkboxes, buttons and functions to groups page;
- add checkboxes, buttons and functions to clients page;
- add checkboxes, buttons and functions to domains page;
- add checkboxes, buttons and functions to adlists page;
- move function to `utils.js`;
- fix CSS after insert a new table column;

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Pass config file path when reloading pihole-FTL.conf

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use DEFAULT_FTLCONFFILE

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add QUERY_SPECIAL_DOMAIN as new query status

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Review comments

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Fix dropdown background color (dark theme)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Show "other" destination as the last graphic item

- Show the item only if it's different than zero

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix prettier

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix `xo`

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Added information about group assignment of whitelisted/blacklisted d… (pi-hole#2186)

* Added information about group assignment of whitelisted/blacklisted domains

Signed-off-by: martinbrose <13284268+martinbrose@users.noreply.github.com>

Co-authored-by: yubiuser <ckoenig@posteo.de>
Co-authored-by: Adam Warner <github@adamwarner.co.uk>

* Applying the reviewer's suggestions

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix `data.columns` ID replaced by mistake

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Quote SQL reserved word and fix javascript output.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove unused variable

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Only remove last data point for line charts as it is not representative there (pi-hole#2195)

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Scale axes to integer

Signed-off-by: Christian König <ckoenig@posteo.de>

* Only remove last data point for line charts as it is not representative there

Signed-off-by: Christian König <ckoenig@posteo.de>

* Reduce border size of line charts

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fixing weird bug

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fixing minor inconsistencies

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove duplicate function declarations

and move functions to `func.php`.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* /var/log/ -> /var/log/pihole/

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Add missing columns `reply_type`, `reply_time`, `dnssec`

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix multiplier (`reply_time` field unit is second)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix prettier

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Using global `utils.showAlert` function

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix prettier

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Removing old function call

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Clean text fields after success.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Keep field values when deleting + Fix typo

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Bump xo from 0.48.0 to 0.49.0

Bumps [xo](https://github.com/xojs/xo) from 0.48.0 to 0.49.0.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](xojs/xo@v0.48.0...v0.49.0)

---
updated-dependencies:
- dependency-name: xo
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove unused case

* Remove empty line before PHP opening tag

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Bump postcss from 8.4.12 to 8.4.14

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.12 to 8.4.14.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.12...8.4.14)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump autoprefixer from 10.4.4 to 10.4.7

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.4 to 10.4.7.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md)
- [Commits](postcss/autoprefixer@10.4.4...10.4.7)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Drop IE 11

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove unused eslint compat rule

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove repo specific PR template

Signed-off-by: Christian König <ckoenig@posteo.de>

* Also check wildcard domains for validity before adding

Signed-off-by: Christian König <ckoenig@posteo.de>

* Replace `queries` with `query_storage`

- use client names, when available;
- use column names instead of indexes;

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Change lighttpd log file names

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use IP if there is no client name

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix DNSSEC info

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fixing prettier line break

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Use the same types, as returned by FTL

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Make it clearer where to find the debug token

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use consistent output for both query lists

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Use the correct endpoint for MAXLOGAGE

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Show suggested domains in group domains page

Signed-off-by: Anthony de Jong <11158888+anthony-de-jong@users.noreply.github.com>

* Fix possible XSS in `queryads.php`

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Base DHCP settings on default gateway address and not on IPV4_ADDRESS from setupVars.conf

Signed-off-by: Christian König <ckoenig@posteo.de>

* Do not use IPvX from setupVars in

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fix indention

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove unnecessary else case

Signed-off-by: Christian König <ckoenig@posteo.de>

* Omit DHCPdomain

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>

* Add a default option for PORTFILE

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Use API gateway endpoint

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove unnecessary requirement

* Bump xo from 0.49.0 to 0.50.0

Bumps [xo](https://github.com/xojs/xo) from 0.49.0 to 0.50.0.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](xojs/xo@v0.49.0...v0.50.0)

---
updated-dependencies:
- dependency-name: xo
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Use simpler logic

Co-authored-by: Adam Warner <me@adamwarner.co.uk>

Signed-off-by: yubiuser <ckoenig@posteo.de>

* Update dependabot.yml

Add requested reviewers 

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Fix part of issue pi-hole/FTL#1319

Signed-off-by: Pingger Shikkoken <Pingger@users.noreply.github.com>

* Bump prettier from 2.6.2 to 2.7.1

Bumps [prettier](https://github.com/prettier/prettier) from 2.6.2 to 2.7.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@2.6.2...2.7.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Upgrade stale action to v5

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add stale-issue-reason

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add github-action to dependabot

Signed-off-by: Christian König <ckoenig@posteo.de>

* Adjust debug log scroll position

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add .editorconfig

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add yml editorconfig style

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add editorconfig-checker action workflow

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove unused parameter

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Adjust .editorconfig to avoid warning messages

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove old debug output

and fix indentation.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add stickler-CI to test yaml and mkdowm files

Signed-off-by: Christian König <ckoenig@posteo.de>

* Exclude vendor files from stickler check

Signed-off-by: Christian König <ckoenig@posteo.de>

* Bump postcss-cli from 9.1.0 to 10.0.0

Bumps [postcss-cli](https://github.com/postcss/postcss-cli) from 9.1.0 to 10.0.0.
- [Release notes](https://github.com/postcss/postcss-cli/releases)
- [Changelog](https://github.com/postcss/postcss-cli/blob/master/CHANGELOG.md)
- [Commits](postcss/postcss-cli@9.1.0...10.0.0)

---
updated-dependencies:
- dependency-name: postcss-cli
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Switch to node 16.x

Signed-off-by: Christian König <ckoenig@posteo.de>

* Run stale workflow at 8:00 once per day

Signed-off-by: Christian König <ckoenig@posteo.de>

* Change FTL's default log file path from /var/log/pihole/pihole-FTL.log to /var/log/pihole/FTL.log

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Use a random name when creating intermediat archive for teleporter

Signed-off-by: Christian König <ckoenig@posteo.de>

* Show names in top clients list from long-term data

Signed-off-by: Christian König <ckoenig@posteo.de>

* Address reviewer's comment

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>

Signed-off-by: yubiuser <ckoenig@posteo.de>

* Fix close-issue-reason

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add yamllint config, fix some indentation

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Co-authored-by: yubiuser <ckoenig@posteo.de>
Co-authored-by: DL6ER <dl6er@dl6er.de>
Co-authored-by: martinbrose <13284268+martinbrose@users.noreply.github.com>
Co-authored-by: Adam Warner <github@adamwarner.co.uk>
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Co-authored-by: Anthony de Jong <11158888+anthony-de-jong@users.noreply.github.com>
Co-authored-by: Pingger Shikkoken <Pingger@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants