diff --git a/CHANGELOG.md b/CHANGELOG.md
index dff064d..79e91e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
## (UNRELEASED)
+IMPROVEMENTS:
+
+* Refactor JS code in consul-ui
+* Removed old samples not used anymore
+
BUGFIXs:
* Avoid try publishing several times Gem on rubygems.org
diff --git a/README.md b/README.md
index b405b14..f5c553d 100644
--- a/README.md
+++ b/README.md
@@ -251,19 +251,17 @@ by consul-templaterb.
Have a look into the [samples/](samples/) directory to browse example files which contains those
examples:
-1. [List all nodes on Cluster](samples/nodes.html.erb)
-2. [Show all services in Cluster](samples/services.html.erb)
-3. [Show all Service Checks and their output](samples/checks.html.erb)
-4. [Show all Key/Values nicely](samples/keys.html.erb)
-5. [Show Choregraphies - work on content of K/V with JSON](samples/criteo_choregraphies.html.erb)
-6. [Services in XML](samples/consul_template.xml.erb)
-7. [Services in JSON](samples/consul_template.json.erb)
-8. [Generate HaProxy Configuration](samples/ha_proxy.cfg.erb)
-9. [Export Consul Statistics to Prometheus](samples/metrics.erb) : count all services, their state,
+1. [List all nodes on Cluster](samples/consul-ui/consul_nodes.json.erb)
+2. [Show all services in Cluster](samples/consul-ui/consul_services.json.erb)
+3. [Show all Key/Values nicely](samples/consul-ui/consul_keys.json.erb)
+4. [Services in XML](samples/consul_template.xml.erb)
+5. [Services in JSON](samples/consul_template.json.erb)
+6. [Generate HaProxy Configuration](samples/ha_proxy.cfg.erb)
+7. [Export Consul Statistics to Prometheus](samples/metrics.erb) : count all services, their state,
datacenters and nodes and export it to prometheus easily to trigger alerts.
-10. [List all services/Nodes with their statuses for all datacenters](samples/all_services.txt.erb)
-11. [Show all services/instances not passing on all DCs](samples/tools/find_all_failing_services.txt.erb)
-12. [List all rubygems consul versions from remote server JSON](samples/list_ruby_versions_from_rubygems.txt.erb)
+8. [List all services/Nodes with their statuses for all datacenters](samples/all_services.txt.erb)
+9. [Show all services/instances not passing on all DCs](samples/tools/find_all_failing_services.txt.erb)
+10. [List all rubygems consul versions from remote server JSON](samples/list_ruby_versions_from_rubygems.txt.erb)
If you want to test it quickly, you might try with (assuming your consul agent is listening on
`http://localhost:8500`):
diff --git a/samples/keys.html.erb b/samples/keys.html.erb
deleted file mode 100644
index 1cfedce..0000000
--- a/samples/keys.html.erb
+++ /dev/null
@@ -1,42 +0,0 @@
-<%= render_file('common/header.html.erb', title: 'Keys') %>
-<% path = ENV['kv_path'] || '' %>
-<% require 'base64'
- require 'json'
- require 'date'
-%>
-
-
-
Show all keys <%= path == '' ? '' : "under hierarchy #{path}" %>
-
-
-<%
- kv(path, recurse:true).each do |tuple|
- key = tuple['Key']
- val = "NO_VALUE"
- if !tuple['Value'].nil?
- begin
- val = Base64.decode64(tuple['Value'])
- rescue StdError => e
- val = "#{e.inspect} for tuple['Value']"
- end
- end
-%>
-
-<% nodes.sort {|a,b| a['Node'] <=> b['Node'] }.each do |snode|
-%>
- <%= snode['Address'] %> <%= snode['Node'] %><%
- snode['Meta'].each do |k,v|
- if v && !v.empty?
-%><%= k %>: <%= v%><%
- end
- end if snode['Meta']
- %>
><%=
- snode['Node']['Node'] %><%= port %>
- <%
- snode['Service']['Tags'].sort.each do |t|
- %><%= t %><%
- end
- %>
- <%
- snode['Checks'].each do |c| %> <%= c['Status']
- %><% end if snode['Checks'] %>