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.

Sign up for GitHub

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

Jump to bottom

Use FTL's taildored /padd endpoint to reduce the number of API calls #399

Merged
merged 13 commits into from
Aug 12, 2024
Merged

Use FTL's taildored /padd endpoint to reduce the number of API calls #399

merged 13 commits into from
Aug 12, 2024

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Aug 9, 2024 •
edited
Loading

What does this PR aim to accomplish?:

Use FTL's taildored /padd endpoint to reduce the number of API calls

Needs pi-hole/FTL#2026

By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.
  • I have read the above and my PR is ready for review. Check this box to confirm

DL6ER and others added 12 commits August 5, 2024 19:01
@DL6ER
Use new FTL api/padd endpoint for querying the data
5559796 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Use jq only once for parsing the entire payload after querying the API
113ef44 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Redefine jq's paths() as its built-in function skips all pais with va…
1310ea8 
…lues null and false

Signed-off-by: DL6ER <[email protected]>
@rdwebdesign
Using paths(scalars | true) to return null and false values.
f1c3382 
We also check if the value is exactly `null` and, in this case, return the
string "null", as jq would return an empty string for nulls.

Signed-off-by: RD WebDesign <[email protected]>
@yubiuser
Rename functions to clarify their use
285f387 
Signed-off-by: yubiuser <[email protected]>
@yubiuser
Re add necessary 2>/dev/null
d8c6f33 
Signed-off-by: yubiuser <[email protected]>
@yubiuser
Suppress curl errors
e18403b 
Signed-off-by: yubiuser <[email protected]>
@yubiuser
padd_data is a global variable
573d36f 
Signed-off-by: yubiuser <[email protected]>
@yubiuser
Propagate API response errors upstream
ed3143f 
Signed-off-by: yubiuser <[email protected]>
@yubiuser
Fix --version command
97006b0 
Signed-off-by: yubiuser <[email protected]>
@yubiuser
Skip all the processing if FTL is down
51fde8a 
Signed-off-by: yubiuser <[email protected]>
@yubiuser
Set --connect-timeout for curl connections
09e3396 
Signed-off-by: yubiuser <[email protected]>
@yubiuser yubiuser mentioned this pull request Aug 9, 2024
Closed
1 task
@yubiuser yubiuser requested review from rdwebdesign, DL6ER and a team August 9, 2024 20:58
@yubiuser yubiuser merged commit 9e7d6c8 into PADD_FTLv6 Aug 12, 2024
5 checks passed
@yubiuser yubiuser deleted the new/api_padd branch August 12, 2024 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DL6ER DL6ER DL6ER approved these changes

@rdwebdesign rdwebdesign Awaiting requested review from rdwebdesign

Assignees
No one assigned
Labels
Pi-hole v6.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yubiuser @DL6ER @rdwebdesign