Skip to content

Commit 814cc24

Browse files
authored
Merge branch 'master' into ft/add-peep-storage
2 parents d6b41ff + 6022d47 commit 814cc24

42 files changed

Lines changed: 462 additions & 441 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.formatter.exs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Used by "mix format"
22
[
33
line_length: 120,
4-
inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
4+
inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"],
5+
import_deps: [:plug, :phoenix_live_view, :phoenix]
56
]

.github/workflows/main.yml

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ env:
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [master]
99
pull_request:
10-
branches: [ master ]
10+
branches: [master]
1111

1212
jobs:
1313
static_analysis:
@@ -16,12 +16,12 @@ jobs:
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020
- name: Set up Elixir
21-
uses: erlef/setup-elixir@v1
21+
uses: erlef/setup-beam@v1
2222
with:
23-
elixir-version: '1.13.4'
24-
otp-version: '25.0'
23+
elixir-version: "1.17.2"
24+
otp-version: "27.0"
2525
- name: Restore cache
2626
uses: actions/cache@v3
2727
with:
@@ -52,16 +52,16 @@ jobs:
5252
strategy:
5353
matrix:
5454
elixir:
55-
- '1.13'
55+
- "1.17"
5656
otp:
57-
- '24.0'
58-
- '25.0'
57+
- "26.0"
58+
- "27.0"
5959

6060
steps:
6161
- name: Checkout code
62-
uses: actions/checkout@v2
62+
uses: actions/checkout@v4
6363
- name: Set up Elixir
64-
uses: erlef/setup-elixir@v1
64+
uses: erlef/setup-beam@v1
6565
with:
6666
elixir-version: ${{ matrix.elixir }}
6767
otp-version: ${{ matrix.otp }}
@@ -70,4 +70,27 @@ jobs:
7070
- name: ExUnit tests
7171
env:
7272
MIX_ENV: test
73-
run: mix coveralls.github
73+
run: mix coveralls.github --exclude mix_task:true
74+
75+
mix_task_tests:
76+
name: Mix task tests
77+
runs-on: ubuntu-latest
78+
79+
steps:
80+
- name: Checkout code
81+
uses: actions/checkout@v4
82+
- name: Set up Elixir
83+
uses: erlef/setup-beam@v1
84+
with:
85+
elixir-version: "1.17.2"
86+
otp-version: "27.0"
87+
- name: Install dependencies
88+
run: mix deps.get
89+
- name: Generate config test
90+
env:
91+
MIX_ENV: test
92+
run: mix test --only mix_task_gen_config:true
93+
- name: Export dashboard test
94+
env:
95+
MIX_ENV: test
96+
run: mix test --only mix_task_dashboard_export:true

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7676
- All plugin distribution buckets have been redefined. The reason for this being that prior to PromEx 1.7, some of the
7777
distribution buckets were a bit wasteful and were not adding value in terms of metrics data points. With this change,
7878
users should notice a decline in data point cardinality without compromising resolution.
79-
- Application plugin has changed how it fetches dependency information. It is now using `Applciation.spec/1` to get the
79+
- Application plugin has changed how it fetches dependency information. It is now using `Application.spec/1` to get the
8080
list of applications that are started with your application. This should reduce noise in the Grafana dashboard as all
8181
the default OTP and Elixir applications will not show up.
8282
- All Grafana dashboard now have a default panel sort order where the largest timeseries plot is first in the list when

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ project in order to help ensure its continued development.
8383

8484
### Bronze Sponsors
8585

86-
<a href="https://smartlogic.io/" style="margin-right: 10px;" target="_blank">
87-
<img align="center" height="50" src="guides/images/smartlogic-logo-teal-400.png" alt="SmartLogic Consultancy">
88-
</a>
89-
9086
<a href="https://github.com/sponsors/akoutmos/sponsorships?sponsor=akoutmos&tier_id=17615">
9187
<img align="center" height="125" src="guides/images/your_logo_here.png" alt="Support the project">
9288
</a>

benchmarks/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Usage: $0 OPTIONS
2727
2828
OPTIONS:
2929
-c Concurrent connections (default: 1)
30-
-k Enable keepalive (defalt: no)
30+
-k Enable keepalive (default: no)
3131
-E Extra parameters
3232
-n Number of requests (default: 1)
3333
-u Url to test (mandatory)
@@ -49,8 +49,8 @@ Will create the following results:
4949

5050
#### Test results
5151

52-
* [values.csv](exmple_results/values.csv)
53-
* [percentages.csv](exmple_results/values.csv)
52+
* [values.csv](example_results/values.csv)
53+
* [percentages.csv](example_results/values.csv)
5454

5555
#### Test summary results
5656
* summary.txt
@@ -143,7 +143,7 @@ Usage: ./ab-graph_scale.sh OPTIONS
143143
144144
OPTIONS:
145145
-c Start concurrent connections at (default: 5)
146-
-e Stop concurrent connections at (defalt: 25)
146+
-e Stop concurrent connections at (default: 25)
147147
-k Enable keepalive connections (default: no)
148148
-s Concurrent connections increment step (default: 5)
149149
-n Number of requests (default: 500)

benchmarks/ab-graph.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Usage: $0 OPTIONS
2323
2424
OPTIONS:
2525
-c Concurrent connections (default: 1)
26-
-k Enable keepalive (defalt: no)
26+
-k Enable keepalive (default: no)
2727
-E Extra parameters
2828
-n Number of requests (default: 1)
2929
-u Url to test (mandatory)
@@ -93,7 +93,7 @@ echo -e "${0} - version ${VERSION}\n"
9393

9494

9595
if [ "${CONCURRENCY}" == "" ]; then
96-
echo "No concurrency set, using default value of ${DEFAULT_CONCURRENCY} simultanious clients"
96+
echo "No concurrency set, using default value of ${DEFAULT_CONCURRENCY} simultaneous clients"
9797
CONCURRENCY=${DEFAULT_CONCURRENCY}
9898
fi
9999

benchmarks/ab-graph_scale.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ SLEEP=60
99
usage()
1010
{
1111
cat << EOF
12-
Helper script for ab-graph that can run multple configurable runs in one go.
12+
Helper script for ab-graph that can run multiple configurable runs in one go.
1313
1414
Usage: $0 OPTIONS
1515
1616
OPTIONS:
1717
-c Start concurrent connections at (default: 5)
18-
-e Stop concurrent connections at (defalt: 25)
18+
-e Stop concurrent connections at (default: 25)
1919
-k Enable keepalive connections (default: no)
2020
-s Concurrent connections increment step (default: 5)
2121
-n Number of requests (default: 500)
@@ -24,7 +24,7 @@ OPTIONS:
2424
-h Print help.
2525
-V Debug mode.
2626
27-
This script will do multple test runs of ab-graph incrementing the concurrent
27+
This script will do multiple test runs of ab-graph incrementing the concurrent
2828
connections until the limit set by -e option is reached.
2929
3030
EOF

config/config.exs

Lines changed: 0 additions & 19 deletions
This file was deleted.

coveralls.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2-
"skip_files": ["test/"],
2+
"skip_files": [
3+
"test/",
4+
"lib/mix/"
5+
],
36
"minimum_coverage": 75
47
}

example_applications/shared_docker/grafana/datasources/datasource.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ deleteDatasources:
77
orgId: 1
88

99
# list of datasources to insert/update depending
10-
# whats available in the database
10+
# what's available in the database
1111
datasources:
1212
# <string, required> name of the datasource. Required
1313
- name: prometheus

0 commit comments

Comments
 (0)