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

[NEW] Add prometheus port config #11115

Merged
merged 13 commits into from
Jun 15, 2018
Merged

[NEW] Add prometheus port config #11115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f57fd07
Semantic markup
brylie Jan 28, 2018
047e6f3
Fix spelling of "collaborative"
stuartpb Mar 14, 2018
da7e38c
Merge branch 'master' into patch-1
engelgabriel Jun 7, 2018
c1845df
Merge pull request #9534 from brylie/patch-1
engelgabriel Jun 7, 2018
bd99dae
Merge branch 'master' into patch-1
engelgabriel Jun 7, 2018
a0c709c
Merge pull request #10134 from stuartpb/patch-1
engelgabriel Jun 7, 2018
9851503
Add `Prometheus_Port` configuration item
Jun 13, 2018
848b66a
Add `Prometheus_Port` configuration item
Jun 13, 2018
cd81778
Fix merge conflicts
Jun 13, 2018
ed428a7
Remove unrelated change
Jun 13, 2018
141ee9c
Merge branch 'develop' into add-prometheus-port-config
thaiphv Jun 14, 2018
d62d750
Restore default value for `Prometheus_Port` to `9100`
Jun 14, 2018
9ff72e6
Merge branch 'add-prometheus-port-config' of https://github.com/thaip…
Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/rocketchat-lib/server/lib/metrics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ let timer;
RocketChat.settings.get('Prometheus_Enabled', (key, value) => {
if (value === true) {
server.listen({
port: 9100,
port: RocketChat.settings.get('Prometheus_Port'),
host: process.env.BIND_IP || '0.0.0.0'
});
timer = Meteor.setInterval(setPrometheusData, 5000);
Expand Down
4 changes: 4 additions & 0 deletions packages/rocketchat-lib/server/startup/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1714,6 +1714,10 @@ RocketChat.settings.addGroup('Logs', function() {
type: 'boolean',
i18nLabel: 'Enabled'
});
this.add('Prometheus_Port', 9100, {
type: 'string',
i18nLabel: 'Port'
});
});
});

Expand Down