diff --git a/app/controllers/log_templates_controller.rb b/app/controllers/log_templates_controller.rb index 17a4641c..11ff9326 100644 --- a/app/controllers/log_templates_controller.rb +++ b/app/controllers/log_templates_controller.rb @@ -69,6 +69,6 @@ def set_log_template # Never trust parameters from the scary internet, only allow the white list through. def log_template_params - params.require(:log_template).permit(:name, :tps_limit, :zookeeper_instances, :kafka_instances, :es_instances) + params.require(:log_template).permit(:name, :tps_limit, :zookeeper_instances, :kafka_instances, :es_instances, :consul_instances, :yggdrasil_instances, :kibana_instances) end end diff --git a/app/views/log_templates/_form.html.slim b/app/views/log_templates/_form.html.slim index 5e3fa887..464b0074 100644 --- a/app/views/log_templates/_form.html.slim +++ b/app/views/log_templates/_form.html.slim @@ -17,4 +17,13 @@ .form-group = f.label :es_instances, 'ES Instance' = f.number_field :es_instances, class: 'form-control' + .form-group + = f.label :consul_instances, 'Consul Instance' + = f.number_field :consul_instances, class: 'form-control' + .form-group + = f.label :yggdrasil_instances, 'Yggdrasil Instance' + = f.number_field :yggdrasil_instances, class: 'form-control' + .form-group + = f.label :kibana_instances, 'Kibana Instance' + = f.number_field :kibana_instances, class: 'form-control' .actions = f.submit 'Submit', class: 'btn btn-primary' diff --git a/app/views/log_templates/_log_template.json.jbuilder b/app/views/log_templates/_log_template.json.jbuilder index 8cb5122e..ad94dd9d 100644 --- a/app/views/log_templates/_log_template.json.jbuilder +++ b/app/views/log_templates/_log_template.json.jbuilder @@ -1,2 +1,2 @@ -json.extract! log_template, :id, :name, :tps_limit, :zookeeper_instances, :kafka_instances, :es_instances, :created_at, :updated_at +json.extract! log_template, :id, :name, :tps_limit, :zookeeper_instances, :kafka_instances, :es_instances, :consul_instances, :yggdrasil_instances, :kibana_instances, :created_at, :updated_at json.url log_template_url(log_template, format: :json) diff --git a/app/views/log_templates/index.html.slim b/app/views/log_templates/index.html.slim index a390950e..d7cb17a6 100644 --- a/app/views/log_templates/index.html.slim +++ b/app/views/log_templates/index.html.slim @@ -8,6 +8,9 @@ table.table th.text-center[style="width:100px"] Zookeeper instances th.text-center[style="width:100px"] Kafka instances th.text-center[style="width:100px"] ES instances + th.text-center[style="width:100px"] Consul instances + th.text-center[style="width:100px"] Yggdrasil instances + th.text-center[style="width:100px"] Kibana instances th[style="width:50px"] th[style="width:50px"] th[style="width:50px"] @@ -20,6 +23,9 @@ table.table td.text-center = log_template.zookeeper_instances td.text-center = log_template.kafka_instances td.text-center = log_template.es_instances + td.text-center = log_template.consul_instances + td.text-center = log_template.yggdrasil_instances + td.text-center = log_template.kibana_instances td = link_to 'Show', log_template td = link_to 'Edit', edit_log_template_path(log_template) td = link_to 'Destroy', log_template, data: { confirm: 'Are you sure?' }, method: :delete diff --git a/app/views/log_templates/show.html.slim b/app/views/log_templates/show.html.slim index 448ed0bb..bbc4192c 100644 --- a/app/views/log_templates/show.html.slim +++ b/app/views/log_templates/show.html.slim @@ -15,6 +15,15 @@ p p strong Es instances: = @log_template.es_instances +p + strong Consul instances: + = @log_template.consul_instances +p + strong Yggdrasil instances: + = @log_template.yggdrasil_instances +p + strong Kibana instances: + = @log_template.kibana_instances => link_to 'Edit', edit_log_template_path(@log_template) '|