Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Make Prometheus snippet less confusing on the metrics collection page #4288

Merged
merged 1 commit into from
May 10, 2019

Conversation

gergelypolonkai
Copy link
Contributor

The port number used in the example is completely different from what is used in the synapse config snippets.

Signed-off-by: Gergely Polonkai gergely@polonkai.eu

Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
@richvdh richvdh changed the base branch from master to develop December 11, 2018 11:15
@richvdh
Copy link
Member

richvdh commented Dec 11, 2018

Thanks. Please can you fill in a changelog entry.

Please can you also make PRs against develop in future.

(both are mentioned in CONTRIBUTING.rst and the PR template)

Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

@richvdh richvdh closed this May 10, 2019
@richvdh richvdh reopened this May 10, 2019
@codecov
Copy link

codecov bot commented May 10, 2019

Codecov Report

Merging #4288 into develop will decrease coverage by 0.97%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #4288      +/-   ##
===========================================
- Coverage    73.49%   72.51%   -0.98%     
===========================================
  Files          302      333      +31     
  Lines        29892    33883    +3991     
  Branches      4887        0    -4887     
===========================================
+ Hits         21968    24570    +2602     
- Misses        6488     9313    +2825     
+ Partials      1436        0    -1436
Impacted Files Coverage Δ
synapse/replication/slave/storage/receipts.py 0% <0%> (-100%) ⬇️
synapse/replication/slave/storage/registration.py 0% <0%> (-100%) ⬇️
synapse/replication/slave/storage/appservice.py 0% <0%> (-100%) ⬇️
synapse/replication/slave/storage/events.py 0% <0%> (-97.92%) ⬇️
synapse/util/logformatter.py 0% <0%> (-88.89%) ⬇️
synapse/replication/slave/storage/account_data.py 0% <0%> (-87.88%) ⬇️
synapse/state/v2.py 10.82% <0%> (-82.99%) ⬇️
...se/replication/slave/storage/_slaved_id_tracker.py 0% <0%> (-81.82%) ⬇️
synapse/rest/consent/consent_resource.py 0% <0%> (-74.49%) ⬇️
synapse/replication/slave/storage/devices.py 0% <0%> (-69.7%) ⬇️
... and 244 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 89ac2a5...5f29355. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented May 10, 2019

Codecov Report

Merging #4288 into develop will decrease coverage by 0.97%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #4288      +/-   ##
===========================================
- Coverage    73.49%   72.51%   -0.98%     
===========================================
  Files          302      333      +31     
  Lines        29892    33883    +3991     
  Branches      4887        0    -4887     
===========================================
+ Hits         21968    24570    +2602     
- Misses        6488     9313    +2825     
+ Partials      1436        0    -1436
Impacted Files Coverage Δ
synapse/replication/slave/storage/receipts.py 0% <0%> (-100%) ⬇️
synapse/replication/slave/storage/registration.py 0% <0%> (-100%) ⬇️
synapse/replication/slave/storage/appservice.py 0% <0%> (-100%) ⬇️
synapse/replication/slave/storage/events.py 0% <0%> (-97.92%) ⬇️
synapse/util/logformatter.py 0% <0%> (-88.89%) ⬇️
synapse/replication/slave/storage/account_data.py 0% <0%> (-87.88%) ⬇️
synapse/state/v2.py 10.82% <0%> (-82.99%) ⬇️
...se/replication/slave/storage/_slaved_id_tracker.py 0% <0%> (-81.82%) ⬇️
synapse/rest/consent/consent_resource.py 0% <0%> (-74.49%) ⬇️
synapse/replication/slave/storage/devices.py 0% <0%> (-69.7%) ⬇️
... and 244 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 89ac2a5...5f29355. Read the comment docs.

@richvdh
Copy link
Member

richvdh commented May 10, 2019

I guess it's just docs.

@richvdh richvdh merged commit cd3f300 into matrix-org:develop May 10, 2019
anoadragon453 added a commit that referenced this pull request May 10, 2019
* develop: (45 commits)
  URL preview blacklisting fixes (#5155)
  Revert 085ae34
  Add a DUMMY stage to captcha-only registration flow
  Make Prometheus snippet less confusing on the metrics collection doc (#4288)
  Set syslog identifiers in systemd units (#5023)
  Run Black on the tests again (#5170)
  Add AllowEncodedSlashes to apache (#5068)
  remove instructions for jessie installation (#5164)
  Run `black` on per_destination_queue
  Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)
  Fix bogus imports in tests (#5154)
  add options to require an access_token to GET /profile and /publicRooms on CS API (#5083)
  Do checks on aliases for incoming m.room.aliases events (#5128)
  Remove the requirement to authenticate for /admin/server_version. (#5122)
  Fix spelling in server notices admin API docs (#5142)
  Fix sample config
  0.99.3.2
  include disco in deb build target list
  changelog
  Debian: we now need libpq-dev.
  ...
anoadragon453 added a commit that referenced this pull request May 10, 2019
* develop:
  Revert 085ae34
  Add a DUMMY stage to captcha-only registration flow
  Make Prometheus snippet less confusing on the metrics collection doc (#4288)
  Set syslog identifiers in systemd units (#5023)
  Run Black on the tests again (#5170)
  Add AllowEncodedSlashes to apache (#5068)
  remove instructions for jessie installation (#5164)
  Run `black` on per_destination_queue
  Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants