You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2018/04/26 15:11:02 UTC
ignite git commit: IGNITE-8215 Web Console: Fixed missing
"metricsSubIntervalCount" and "metricsRateTimeInterval" on "Configuration"
screen.
Repository: ignite
Updated Branches:
refs/heads/master 675d697ec -> 9f855fb52
IGNITE-8215 Web Console: Fixed missing "metricsSubIntervalCount" and "metricsRateTimeInterval" on "Configuration" screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f855fb5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f855fb5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f855fb5
Branch: refs/heads/master
Commit: 9f855fb52cdf861632d0baea9ffa0c3094923a08
Parents: 675d697
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Thu Apr 26 22:10:54 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Apr 26 22:10:54 2018 +0700
----------------------------------------------------------------------
.../templates/data-storage.pug | 20 ++++++++++----------
.../cluster-edit-form/templates/discovery.pug | 2 +-
.../frontend/app/services/Clusters.js | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f855fb5/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
index 4ed30b6..06a5a4a 100644
--- a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
+++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/data-storage.pug
@@ -105,25 +105,25 @@ mixin data-region-form({modelAt, namePlaceholder, dataRegionsAt})
.pc-form-grid-col-30
+sane-ignite-form-field-number({
label: 'Metrics sub interval count:',
- model: `${modelAt}.subIntervals`,
- name: '"subIntervals"',
- placeholder: '{{ ::$ctrl.Clusters.dataRegion.subIntervals.default }}',
- min: '{{ ::$ctrl.Clusters.dataRegion.subIntervals.min }}',
- step: '{{ ::$ctrl.Clusters.dataRegion.subIntervals.step }}',
+ model: `${modelAt}.metricsSubIntervalCount`,
+ name: '"metricsSubIntervalCount"',
+ placeholder: '{{ ::$ctrl.Clusters.dataRegion.metricsSubIntervalCount.default }}',
+ min: '{{ ::$ctrl.Clusters.dataRegion.metricsSubIntervalCount.min }}',
+ step: '{{ ::$ctrl.Clusters.dataRegion.metricsSubIntervalCount.step }}',
tip: 'A number of sub-intervals the whole rate time interval will be split into to calculate allocation and eviction rates'
})
.pc-form-grid-col-30
pc-form-field-size(
- ng-model=`${modelAt}.rateTimeInterval`
+ ng-model=`${modelAt}.metricsRateTimeInterval`
ng-model-options='{allowInvalid: true}'
- name='rateTimeInterval'
+ name='metricsRateTimeInterval'
size-type='seconds'
label='Metrics rate time interval:'
- placeholder='{{ $ctrl.Clusters.dataRegion.rateTimeInterval.default / _rateTimeIntervalScale.value }}'
- min=`{{ ::$ctrl.Clusters.dataRegion.rateTimeInterval.min }}`
+ placeholder='{{ $ctrl.Clusters.dataRegion.metricsRateTimeInterval.default / _metricsRateTimeIntervalScale.value }}'
+ min=`{{ ::$ctrl.Clusters.dataRegion.metricsRateTimeInterval.min }}`
tip='Time interval for allocation rate and eviction rate monitoring purposes'
- on-scale-change='_rateTimeIntervalScale = $event'
+ on-scale-change='_metricsRateTimeIntervalScale = $event'
size-scale-label='s'
)
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f855fb5/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/discovery.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/discovery.pug b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/discovery.pug
index 35bd5e8..6008df3 100644
--- a/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/discovery.pug
+++ b/modules/web-console/frontend/app/components/page-configure-advanced/components/cluster-edit-form/templates/discovery.pug
@@ -63,7 +63,7 @@ panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
+number('Thread priority:', `${model}.threadPriority`, '"threadPriority"', 'true', '10', '1', 'Thread priority for all threads started by SPI')
//- Removed in ignite 2.0
- .pc-form-grid-col-60(ng-if='$ctrl.available(["1.0.0", "2.0.0"])')
+ .pc-form-grid-col-60(ng-if-start='$ctrl.available(["1.0.0", "2.0.0"])')
+number('Heartbeat frequency:', `${model}.heartbeatFrequency`, '"heartbeatFrequency"', 'true', '2000', '1', 'Heartbeat messages issuing frequency')
.pc-form-grid-col-30
+number('Max heartbeats miss w/o init:', `${model}.maxMissedHeartbeats`, '"maxMissedHeartbeats"', 'true', '1', '1',
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f855fb5/modules/web-console/frontend/app/services/Clusters.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/services/Clusters.js b/modules/web-console/frontend/app/services/Clusters.js
index 4e057fc..d76f862 100644
--- a/modules/web-console/frontend/app/services/Clusters.js
+++ b/modules/web-console/frontend/app/services/Clusters.js
@@ -275,12 +275,12 @@ export default class Clusters {
return maxPoolSize;
}
},
- subIntervals: {
+ metricsSubIntervalCount: {
default: 5,
min: 1,
step: 1
},
- rateTimeInterval: {
+ metricsRateTimeInterval: {
min: 1000,
default: 60000,
step: 1000