1
0
Fork 0
mirror of https://github.com/sdr-enthusiasts/docker-adsb-ultrafeeder.git synced 2024-12-25 05:42:00 +00:00
Commit graph

290 commits

Author SHA1 Message Date
kx1t
11969ae627 further cleanup 2024-03-29 16:55:15 -04:00
kx1t
dcfdb7ff3e clean up port assignments 2024-03-29 15:30:32 -04:00
kx1t
a407113f1c if no mlat return port is defined in ULTRAFEEDER_CONFIG, then still send results to MLAT-Hub by default 2024-03-29 12:55:39 -04:00
kx1t
16ea7448ac
adsbx stats: more robust way of getting UUID from ultrafeeder_config (#72)
When no adsbexchange uuid was present the sed replacement can fail to
replace anything because the pattern doesn't exist.
In that case the entire readsb conf array is used as an UUID.

Fix that by checking each conf array entry if there is a adsbexchange
uuid and only then use the sed replace.
2024-03-29 12:18:59 -04:00
Matthias Wirth
ec6f092418 adsbx stats: more robust way of getting UUID from ultrafeeder_config 2024-03-29 15:04:00 +01:00
kx1t
0a894ed3d7
add hetluchtruim.nl aggregator 2024-03-28 12:49:30 -04:00
kx1t
58b4f4fee3
Update README.md 2024-03-27 21:33:40 -04:00
kx1t
5957f410d4
Update README.md 2024-03-27 21:25:46 -04:00
kx1t
16b24ddb9e
recreate LICENSE 2024-03-27 21:23:36 -04:00
kx1t
3b05425d84
Delete LICENSE 2024-03-27 21:22:02 -04:00
Fred Clausen
d8d5da4baf
chore(deps): Update pre-commit hooks (#70)
Update pre-commit hooks
2024-03-24 00:37:06 -06:00
fredclausen
93df5dfbdc chore(deps): Update pre-commit hooks 2024-03-24 01:23:49 +00:00
Fred Clausen
2584d18e65
Simplify startup and dependencies (#69)
Move file cleanups into a finish script for the service that created the
file (replace 02 / replace 03 commits)

Currently there is a whole dependency forest just to start a couple of
startup scripts in order.
Additionally all the services also have a dependency on all the startup
scripts.
This is unnecessary complex, simplify it:
- Move startup scripts to /etc/s6-overlay/startup.d
- oneshot service named "startup" from underlying image executes
all files in /etc/s6-overlay/startup.d in alphabetical order
- Remove various oneshot scripts from longrun service dependencies
Add "startup" oneshot service to longrun service dependencies

container-version is now being run by said startup script, remove the
double s6wrap prepending of an appropriate log name.
2024-03-23 06:46:27 -06:00
Matthias Wirth
ab0e9a3e54 remove double s6wrap for container-version 2024-03-20 15:21:44 +00:00
Matthias Wirth
66777d5f99 Simplify startup and dependencies
Move startup scripts to /etc/s6-overlay/startup.d
oneshot service named "startup" from underlying image executes
all files in /etc/s6-overlay/startup.d in alphabetical order
Remove various oneshot scripts from longrun service dependencies
Add "startup" oneshot service to longrun service dependencies
2024-03-20 15:16:00 +00:00
Matthias Wirth
916f045f4c replace 03-remove-mlathub-up
03-remove-mlathub-up deletes /run/mlathub_up when the container stops
As this file is created by the mlat-client service, remove it instead in
a finish script for mlat-client which is run when the mlat-client
service is stopped
2024-03-20 15:04:15 +00:00
Matthias Wirth
7beb37b14d replace 02-remove-prometheus-data
02-remove-prometheus-data deletes /run/readsb-prometheus.prom when
the container stops
As this file is created by readsb, remove it instead in a finish script
for readsb which is run when the readsb service is stopped
2024-03-20 13:41:33 +00:00
kx1t
357a77ef43
Update README.md 2024-03-19 13:14:50 -04:00
Fred Clausen
8e35cd9624
chore(deps): Update pre-commit hooks (#63)
Update pre-commit hooks
2024-03-18 08:36:26 -06:00
fredclausen
ded713f38f chore(deps): Update pre-commit hooks 2024-03-17 01:21:41 +00:00
kx1t
01fcc342a0
network buffering / mlat stagger customisation option (#68)
Increasing the beast-reduce flush interval will reduce network load for
aggregators by sending less but larger network packets.

mlat-client startup can take quite some time when using several
aggregators, add an ENV var so people can reduce it if they prefer.

mlathub was using beast_reduce_out to send data, this is local transfer
so using beast_reduce is not necessary. (mlat results are not high
message rate in any case)
2024-03-14 15:37:03 -04:00
Matthias Wirth
6f6587f8a6 allow user to customise mlat-client startup stagger delay 2024-03-14 15:50:56 +01:00
Matthias Wirth
9221009a56 use beast_out instead of beast_reduce_out for mlat results 2024-03-14 15:50:56 +01:00
Matthias Wirth
2de1f3eed9 increase beast-reduce flush interval 2024-03-14 15:50:56 +01:00
kx1t
3e08831f78
Update README.md 2024-02-27 12:14:33 -05:00
kx1t
10ca792401
Allow overriding the Prometheus port (#64)
The docs suggest you can do this, but the code does not allow for it.
This fixes that so you can specify your own port.

I've spotted an error in the docs too, MR for that repo will be along
shortly.
2024-02-27 12:13:28 -05:00
kx1t
2306c130ba
README.md - update json positional port description 2024-02-27 11:59:00 -05:00
kx1t
b209dc49aa
beast-reduce-interval reduction + READSB_ENABLE_API (#65) 2024-02-21 21:00:26 -05:00
Matthias Wirth
3047cdc910 add READSB_ENABLE_API to readsb startup script / documentation
most of this feature is handled in the docker-tar1090 baseimage
2024-02-20 15:01:12 +01:00
Matthias Wirth
bd6ea02c96 reduce --net-beast-reduce-interval default to 0.5 (was 1.0)
this is the default used by most of the affected aggregators
2024-02-20 14:58:23 +01:00
Robin Kearney
82216d49f7
Allow overriding the Prometheus port 2024-02-19 11:52:06 +00:00
Fred Clausen
f941be563f
chore(deps): Update pre-commit hooks (#62)
Update pre-commit hooks
2024-02-04 00:32:46 -07:00
fredclausen
578dc56fd1 chore(deps): Update pre-commit hooks 2024-02-04 01:22:06 +00:00
Fred Clausen
9c00aca91b
Bump peter-evans/create-pull-request from 5 to 6 (#61)
Bumps
[peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request)
from 5 to 6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/peter-evans/create-pull-request/releases">peter-evans/create-pull-request's
releases</a>.</em></p>
<blockquote>
<h2>Create Pull Request v6.0.0</h2>
<h2>Behaviour changes</h2>
<ul>
<li>The default values for <code>author</code> and
<code>committer</code> have changed. See &quot;What's new&quot; below
for details. If you are overriding the default values you will not be
affected by this change.</li>
<li>On completion, the action now removes the temporary git remote
configuration it adds when using <code>push-to-fork</code>. This should
not affect you unless you were using the temporary configuration for
some other purpose after the action completes.</li>
</ul>
<h2>What's new</h2>
<ul>
<li>Updated runtime to Node.js 20
<ul>
<li>The action now requires a minimum version of <a
href="https://github.com/actions/runner/releases/tag/v2.308.0">v2.308.0</a>
for the Actions runner. Update self-hosted runners to v2.308.0 or later
to ensure compatibility.</li>
</ul>
</li>
<li>The default value for <code>author</code> has been changed to
<code>${{ github.actor }} &lt;${{ github.actor_id }}+${{ github.actor
}}@users.noreply.github.com&gt;</code>. The change adds the <code>${{
github.actor_id }}+</code> prefix to the email address to align with
GitHub's standard format for the author email address.</li>
<li>The default value for <code>committer</code> has been changed to
<code>github-actions[bot]
&lt;41898282+github-actions[bot]@users.noreply.github.com&gt;</code>.
This is to align with the default GitHub Actions bot user account.</li>
<li>Adds input <code>git-token</code>, the <a
href="https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token">Personal
Access Token (PAT)</a> that the action will use for git operations. This
input defaults to the value of <code>token</code>. Use this input if you
would like the action to use a different token for git operations than
the one used for the GitHub API.</li>
<li><code>push-to-fork</code> now supports pushing to sibling
repositories in the same network.</li>
<li>Previously, when using <code>push-to-fork</code>, the action did not
remove temporary git remote configuration it adds during execution. This
has been fixed and the configuration is now removed when the action
completes.</li>
<li>If the pull request body is truncated due to exceeding the maximum
length, the action will now suffix the body with the message
&quot;...<em>[Pull request body truncated]</em>&quot; to indicate that
the body has been truncated.</li>
<li>The action now uses <code>--unshallow</code> only when necessary,
rather than as a default argument of <code>git fetch</code>. This should
improve performance, particularly for large git repositories with
extensive commit history.</li>
<li>The action can now be executed on one GitHub server and create pull
requests on a <em>different</em> GitHub server. Server products include
GitHub hosted (github.com), GitHub Enterprise Server (GHES), and GitHub
Enterprise Cloud (GHEC). For example, the action can be executed on
GitHub hosted and create pull requests on a GHES or GHEC instance.</li>
</ul>
<h2>What's Changed</h2>
<ul>
<li>Update distribution by <a
href="https://github.com/actions-bot"><code>@​actions-bot</code></a> in
<a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2086">peter-evans/create-pull-request#2086</a></li>
<li>fix crazy-max/ghaction-import-gp parameters by <a
href="https://github.com/fharper"><code>@​fharper</code></a> in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2177">peter-evans/create-pull-request#2177</a></li>
<li>Update distribution by <a
href="https://github.com/actions-bot"><code>@​actions-bot</code></a> in
<a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2364">peter-evans/create-pull-request#2364</a></li>
<li>Use checkout v4 by <a
href="https://github.com/okuramasafumi"><code>@​okuramasafumi</code></a>
in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2521">peter-evans/create-pull-request#2521</a></li>
<li>Note about <code>delete-branch</code> by <a
href="https://github.com/dezren39"><code>@​dezren39</code></a> in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2631">peter-evans/create-pull-request#2631</a></li>
<li>98 dependency updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/fharper"><code>@​fharper</code></a> made
their first contribution in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2177">peter-evans/create-pull-request#2177</a></li>
<li><a
href="https://github.com/okuramasafumi"><code>@​okuramasafumi</code></a>
made their first contribution in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2521">peter-evans/create-pull-request#2521</a></li>
<li><a href="https://github.com/dezren39"><code>@​dezren39</code></a>
made their first contribution in <a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2631">peter-evans/create-pull-request#2631</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/peter-evans/create-pull-request/compare/v5.0.2...v6.0.0">https://github.com/peter-evans/create-pull-request/compare/v5.0.2...v6.0.0</a></p>
<h2>Create Pull Request v5.0.2</h2>
<p>⚙️ Fixes an issue that occurs when using <code>push-to-fork</code>
and both base and head repositories are in the same org/user
account.</p>
<h2>What's Changed</h2>
<ul>
<li>fix: specify head repo by <a
href="https://github.com/peter-evans"><code>@​peter-evans</code></a> in
<a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/2044">peter-evans/create-pull-request#2044</a></li>
<li>20 dependency updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/peter-evans/create-pull-request/compare/v5.0.1...v5.0.2">https://github.com/peter-evans/create-pull-request/compare/v5.0.1...v5.0.2</a></p>
<h2>Create Pull Request v5.0.1</h2>
<h2>What's Changed</h2>
<ul>
<li>fix: truncate body if exceeds max length by <a
href="https://github.com/peter-evans"><code>@​peter-evans</code></a> in
<a
href="https://redirect.github.com/peter-evans/create-pull-request/pull/1915">peter-evans/create-pull-request#1915</a></li>
<li>12 dependency updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/peter-evans/create-pull-request/compare/v5.0.0...v5.0.1">https://github.com/peter-evans/create-pull-request/compare/v5.0.0...v5.0.1</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="b1ddad2c99"><code>b1ddad2</code></a>
feat: v6 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2717">#2717</a>)</li>
<li><a
href="bb809027fd"><code>bb80902</code></a>
build(deps-dev): bump <code>@​types/node</code> from 18.19.8 to 18.19.10
(<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2712">#2712</a>)</li>
<li><a
href="e0037d470c"><code>e0037d4</code></a>
build(deps): bump peter-evans/create-or-update-comment from 3 to 4 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2702">#2702</a>)</li>
<li><a
href="94b1f99e3a"><code>94b1f99</code></a>
build(deps): bump peter-evans/find-comment from 2 to 3 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2703">#2703</a>)</li>
<li><a
href="69c27eaf4a"><code>69c27ea</code></a>
build(deps-dev): bump ts-jest from 29.1.1 to 29.1.2 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2685">#2685</a>)</li>
<li><a
href="7ea722a0f6"><code>7ea722a</code></a>
build(deps-dev): bump prettier from 3.2.2 to 3.2.4 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2684">#2684</a>)</li>
<li><a
href="5ee839affd"><code>5ee839a</code></a>
build(deps-dev): bump <code>@​types/node</code> from 18.19.7 to 18.19.8
(<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2683">#2683</a>)</li>
<li><a
href="60fc256c67"><code>60fc256</code></a>
build(deps-dev): bump eslint-plugin-prettier from 5.1.2 to 5.1.3 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2660">#2660</a>)</li>
<li><a
href="0c67723361"><code>0c67723</code></a>
build(deps-dev): bump <code>@​types/node</code> from 18.19.5 to 18.19.7
(<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2661">#2661</a>)</li>
<li><a
href="4e288e851b"><code>4e288e8</code></a>
build(deps-dev): bump prettier from 3.1.1 to 3.2.2 (<a
href="https://redirect.github.com/peter-evans/create-pull-request/issues/2659">#2659</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/peter-evans/create-pull-request/compare/v5...v6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=peter-evans/create-pull-request&package-manager=github_actions&previous-version=5&new-version=6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
2024-02-03 09:08:15 -07:00
dependabot[bot]
aef0a4b62e
Bump peter-evans/create-pull-request from 5 to 6
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5 to 6.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v5...v6)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-01 06:32:12 +00:00
Fred Clausen
8a9e172a74
Update aggregator list (#58) 2024-01-30 10:13:55 -07:00
Fred Clausen
4264b127e4
chore(deps): Update pre-commit hooks (#60)
Update pre-commit hooks
2024-01-30 10:13:06 -07:00
fredclausen
469ab945d5 chore(deps): Update pre-commit hooks 2024-01-28 01:22:09 +00:00
kx1t
249609b233
Update README.md - AVDelphi clarification 2024-01-23 12:10:53 -05:00
henryfrank21
5549763338
Update aggregator list 2024-01-23 16:20:39 +00:00
Fred Clausen
77ffde90c2
chore(deps): Update pre-commit hooks (#56)
Update pre-commit hooks
2024-01-07 14:57:43 -07:00
fredclausen
e777d69924 chore(deps): Update pre-commit hooks 2024-01-07 01:34:07 +00:00
kx1t
f35a391d5d updated file permissions 2024-01-02 15:11:27 -05:00
kx1t
79b5d0cdb2
Create adsbx-url 2024-01-02 15:10:14 -05:00
kx1t
3d237fe89a
Update README.md 2023-12-30 12:33:42 -05:00
Fred Clausen
8368aeb25d
Minor Refactoring of the ".env" File (#55)
Removes location specific variables that seem to have been set by
accident when the current ".env" file was added to the repo. This update
sets them to blank values standardizing their formatting.
2023-12-27 06:39:31 -07:00
sunriselabs-digital
a98cb04232
Update .env
Removes location specific variables and sets them to blank values.
2023-12-26 21:27:14 -05:00
Fred Clausen
71573f9854
chore(deps): Update pre-commit hooks (#54)
Update pre-commit hooks
2023-12-25 16:25:29 -07:00
fredclausen
db9e616395 chore(deps): Update pre-commit hooks 2023-12-24 01:25:27 +00:00
Fred Clausen
0520d206d5
Update README-grafana.md (#53)
Fix missing spaces in yaml [as reported on
Discord](https://ptb.discord.com/channels/734090820684349521/1161036376041607289/1187925020115210291)
2023-12-23 12:21:16 -07:00