diff --git a/manifests/site.pp b/manifests/site.pp
index e2f32f5b..e33541a9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,107 +1,111 @@
 node 'louvre.softwareheritage.org' {
   include role::swh_hypervisor_master
   include role::swh_lsi_storage_adapter
 }
 
 node 'beaubourg.softwareheritage.org', 'orsay.softwareheritage.org' {
   include role::swh_hypervisor
   include role::swh_lsi_storage_adapter
 }
 
 node 'pergamon.softwareheritage.org' {
   include role::swh_sysadmin
 }
 
 node 'tate.softwareheritage.org' {
   include role::swh_forge
 }
 
 node 'moma.softwareheritage.org' {
   include role::swh_api
   include role::swh_apache_log_archiver
 }
 
 node 'webapp0.softwareheritage.org' {
   include role::swh_api_azure
 }
 
 node 'saatchi.internal.softwareheritage.org' {
   include role::swh_scheduler
 }
 
 node /^(prado|somerset).(internal.)?softwareheritage.org$/ {
   include role::swh_database
 }
 
 node 'banco.softwareheritage.org' {
   include role::swh_backup
   include role::swh_lsi_storage_adapter
 }
 
 node
   'esnode1.internal.softwareheritage.org',
   'esnode2.internal.softwareheritage.org',
   'esnode3.internal.softwareheritage.org'
 {
   include role::swh_elasticsearch
 }
 
 node /^(unibo-test|orangeriedev).(internal.)?softwareheritage.org$/ {
   include role::swh_vault_test
 }
 
 node /^(unibo-prod|orangerie).(internal.)?softwareheritage.org$/ {
   include role::swh_vault
 }
 
 node /^(uffizi|storage\d+\.[^.]+\.azure).(internal.)?softwareheritage.org$/ {
   include role::swh_storage
 }
 
 node /^getty.(internal.)?softwareheritage.org$/ {
   include role::swh_eventlog
 }
 
 node 'worker08.softwareheritage.org' {
   include role::swh_worker_inria_miracle
 }
 
 node /^worker\d+\.(internal\.)?softwareheritage\.org$/ {
   include role::swh_worker_inria
 }
 
 node /^worker\d+\..*\.azure\.internal\.softwareheritage\.org$/ {
   include role::swh_worker_azure
 }
 
 node /^dbreplica(0|1)\.euwest\.azure\.internal\.softwareheritage\.org$/ {
   include role::swh_database
 }
 
 node /^ceph-osd\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ceph_osd
 }
 
 node /^ceph-mon\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ceph_mon
 }
 
 node 'thyssen.internal.softwareheritage.org' {
   include role::swh_ci_server
 }
 
 node 'logstash0.internal.softwareheritage.org' {
   include role::swh_logstash_instance
 }
 
+node 'logstash0.internal.softwareheritage.org' {
+  include role::swh_kibana_instance
+}
+
 node
   'giverny.softwareheritage.org',
   'petit-palais.softwareheritage.org',
   'grand-palais.softwareheritage.org'{
   include role::swh_desktop
 }
 
 node default {
   include role::swh_server
   include profile::puppet::agent
 }
diff --git a/site-modules/profile/manifests/kibana.pp b/site-modules/profile/manifests/kibana.pp
new file mode 100644
index 00000000..d80a4d4b
--- /dev/null
+++ b/site-modules/profile/manifests/kibana.pp
@@ -0,0 +1,24 @@
+class profile::kibana {
+
+  package { 'openjdk-8-jre-headless':
+    ensure => 'present',
+  }
+
+  $keyid =  lookup('elastic::apt_config::keyid')
+  $key =    lookup('elastic::apt_config::key')
+
+  apt::source { 'elastic-6.x':
+    location => 'https://artifacts.elastic.co/packages/6.x/apt',
+    release  => 'stable',
+    repos    => 'main',
+    key      => {
+      id      => $keyid,
+      content => $key,
+    },
+  }
+
+  package { 'kibana':
+    ensure => 'present',
+  }
+
+}
diff --git a/site-modules/role/manifests/swh_kibana_instance.pp b/site-modules/role/manifests/swh_kibana_instance.pp
new file mode 100644
index 00000000..29f1ee60
--- /dev/null
+++ b/site-modules/role/manifests/swh_kibana_instance.pp
@@ -0,0 +1,4 @@
+class role::swh_kibana_instance inherits role::swh_base {
+  include profile::puppet::agent
+  include profile::kibana
+}