diff --git a/.env.example b/.env.example
index f10db34..856af6c 100644
--- a/.env.example
+++ b/.env.example
@@ -18,3 +18,33 @@ DEFAULT_HOST_SECRET=8201e33f60093f2ce49f1abe6be8*****
 URL_LIST=[{"name":"localhost","url":"http://localhost","priority":4},{"name":"github.com","url":"https://github.com","priority":4}]
 ZBX_CONFIG={"authentication_type":0,"ok_period":"1d"}
 ZBX_ADMIN_USERS=[{"name":"user","password":"password"},{"name":"user1","password":"password"}]
+GF_SECURITY_ADMIN_PASSWORD=grafana
+GF_AUTH_LDAP_ENABLED=false
+GF_AUTH_LDAP_ALLOW_SIGN_UP=true
+#####Grafana`s LDAP Config Environments#####
+#[[servers]]
+LDAP_GF_HOST=172.17.0.1
+LDAP_GF_PORT=389
+LDAP_GF_USE_SSL=false
+LDAP_GF_START_TLS=false
+LDAP_GF_SKIP_VERIFY=false
+LDAP_GF_BIND_DN=cn=admin,dc=example,dc=org
+LDAP_GF_BIND_PASSWORD=admin
+LDAP_GF_SEARCH_FILTER=(cn=%s)
+LDAP_GF_SEARCH_BASE_DNS=dc=example,dc=org
+#[servers.attributes]
+LDAP_GF_NAME=giveName
+LDAP_GF_SURNAME=sn
+LDAP_GF_USERNAME=cn
+LDAP_GF_MEMBER_OF=memberOf
+LDAP_GF_EMAIL=email
+#[[servers.group_mappings]]
+LDAP_GF_GROUP_DN_ADMIN=cn=admins,dc=example,dc=org
+LDAP_GF_ORG_ROLE_ADMIN=Admin
+#[[servers.group_mappings]]
+LDAP_GF_GROUP_DN_EDITOR=cn=users,dc=example,dc=org
+LDAP_GF_ORG_ROLE_EDITOR=Editor
+#[[servers.group_mappings]]
+LDAP_GF_GROUP_DN_VIEWER=*
+LDAP_GF_ORG_ROLE_VIEWER=Viewer
+
diff --git a/Dockerfile.grafana b/Dockerfile.grafana
new file mode 100644
index 0000000..6a7b5a7
--- /dev/null
+++ b/Dockerfile.grafana
@@ -0,0 +1,13 @@
+ARG GRAFANA_VERSION=6.2.2
+
+FROM grafana/grafana:${GRAFANA_VERSION}
+
+USER root
+
+ENV GF_INSTALL_PLUGINS=alexanderzobnin-zabbix-app
+
+COPY ./scripts/run.sh /
+
+RUN chmod +x /run.sh
+
+ENTRYPOINT [ "/run.sh" ]
diff --git a/Vagrantfile b/Vagrantfile
index 5bd6824..82b8e79 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,6 +5,7 @@ Vagrant.configure("2") do |config|
   config.vm.box = "ubuntu/xenial64"
   config.vm.network "private_network", ip: "192.168.33.102"
   config.vm.network "forwarded_port", guest: 80, host: 8080
+  config.vm.network "forwarded_port", guest: 3000, host: 3000
   config.vm.provider "virtualbox" do |vb|
       vb.memory = "2048"
   end
@@ -33,7 +34,7 @@ Vagrant.configure("2") do |config|
           iotop \
           htop \
           mc
-      #
+      
       echo "Getting docker-compose from official repository..."
       if [ ! -e "/usr/local/bin/docker-compose" ]; then
           curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
diff --git a/configuration/dashboard.yaml.tmpl b/configuration/dashboard.yaml.tmpl
new file mode 100644
index 0000000..bf6a4aa
--- /dev/null
+++ b/configuration/dashboard.yaml.tmpl
@@ -0,0 +1,10 @@
+apiVersion: 1
+
+providers:
+ - name: Zabbix
+   folder:
+   folderUid:
+   type: file
+   updateIntervalSeconds: 60
+   options:
+     path: /var/lib/grafana/dashboards
diff --git a/configuration/datasource.yaml.tmpl b/configuration/datasource.yaml.tmpl
new file mode 100644
index 0000000..2a76184
--- /dev/null
+++ b/configuration/datasource.yaml.tmpl
@@ -0,0 +1,18 @@
+apiVersion: 1
+
+datasources:
+- name: Zabbix
+  type: alexanderzobnin-zabbix-datasource
+  access: proxy
+  url: {0}/api_jsonrpc.php
+  isDefault: true
+  jsonData:
+    username: admin
+    password: {1}
+    trends: true
+    trendsFrom: 7d
+    trendsRange: 4d
+    cacheTTL: 1h
+    alerting: true
+  version: 1
+  editable: false
diff --git a/configuration/grafana.ini b/configuration/grafana.ini
new file mode 100644
index 0000000..f6b476f
--- /dev/null
+++ b/configuration/grafana.ini
@@ -0,0 +1,529 @@
+##################### Grafana Configuration ExamplerR #####################
+#
+# Everything has defaults so you only need to uncomment things you want to
+# change
+
+# possible values : production, development
+;app_mode = production
+
+# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
+;instance_name = ${HOSTNAME}
+
+#################################### Paths ####################################
+[paths]
+# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
+;data = /var/lib/grafana
+
+# Temporary files in `data` directory older than given duration will be removed
+;temp_data_lifetime = 24h
+
+# Directory where grafana can store logs
+;logs = /var/log/grafana
+
+# Directory where grafana will automatically scan and look for plugins
+;plugins = /var/lib/grafana/plugins
+
+# folder that contains provisioning config files that grafana will apply on startup and while running.
+;provisioning = conf/provisioning
+
+#################################### Server ####################################
+[server]
+# Protocol (http, https, socket)
+;protocol = http
+
+# The ip address to bind to, empty will bind to all interfaces
+;http_addr =
+
+# The http port  to use
+;http_port = 3000
+
+# The public facing domain name used to access grafana from a browser
+;domain = localhost
+
+# Redirect to correct domain if host header does not match domain
+# Prevents DNS rebinding attacks
+;enforce_domain = false
+
+# The full public facing url you use in browser, used for redirects and emails
+# If you use reverse proxy and sub path specify full url (with sub path)
+root_url = %(protocol)s://%(domain)s/grafana/
+
+# Log web requests
+;router_logging = false
+
+# the path relative working path
+;static_root_path = public
+
+# enable gzip
+;enable_gzip = false
+
+# https certs & key file
+;cert_file =
+;cert_key =
+
+# Unix socket path
+;socket =
+
+#################################### Database ####################################
+[database]
+# You can configure the database connection by specifying type, host, name, user and password
+# as separate properties or as on string using the url properties.
+
+# Either "mysql", "postgres" or "sqlite3", it's your choice
+;type = sqlite3
+;host = 127.0.0.1:3306
+;name = grafana
+;user = root
+# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+;password =
+
+# Use either URL or the previous fields to configure the database
+# Example: mysql://user:secret@host:port/database
+;url =
+
+# For "postgres" only, either "disable", "require" or "verify-full"
+;ssl_mode = disable
+
+# For "sqlite3" only, path relative to data_path setting
+;path = grafana.db
+
+# Max idle conn setting default is 2
+;max_idle_conn = 2
+
+# Max conn setting default is 0 (mean not set)
+;max_open_conn =
+
+# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
+;conn_max_lifetime = 14400
+
+# Set to true to log the sql calls and execution times.
+log_queries =
+
+# For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
+;cache_mode = private
+
+#################################### Cache server #############################
+[remote_cache]
+# Either "redis", "memcached" or "database" default is "database"
+;type = database
+
+# cache connectionstring options
+# database: will use Grafana primary database.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
+# memcache: 127.0.0.1:11211
+;connstr =
+
+#################################### Data proxy ###########################
+[dataproxy]
+
+# This enables data proxy logging, default is false
+;logging = false
+
+# How long the data proxy should wait before timing out default is 30 (seconds)
+;timeout = 30
+
+# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
+;send_user_header = false
+
+#################################### Analytics ####################################
+[analytics]
+# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
+# No ip addresses are being tracked, only simple counters to track
+# running instances, dashboard and error counts. It is very helpful to us.
+# Change this option to false to disable reporting.
+;reporting_enabled = true
+
+# Set to false to disable all checks to https://grafana.net
+# for new vesions (grafana itself and plugins), check is used
+# in some UI views to notify that grafana or plugin update exists
+# This option does not cause any auto updates, nor send any information
+# only a GET request to http://grafana.com to get latest versions
+;check_for_updates = true
+
+# Google Analytics universal tracking code, only enabled if you specify an id here
+;google_analytics_ua_id =
+
+# Google Tag Manager ID, only enabled if you specify an id here
+;google_tag_manager_id =
+
+#################################### Security ####################################
+[security]
+# default admin user, created on startup
+;admin_user = admin
+
+# default admin password, can be changed before first start of grafana,  or in profile settings
+;admin_password = admin
+
+# used for signing
+;secret_key = SW2YcwTIb9zpOOhoPsMm
+
+# disable gravatar profile images
+;disable_gravatar = false
+
+# data source proxy whitelist (ip_or_domain:port separated by spaces)
+;data_source_proxy_whitelist =
+
+# disable protection against brute force login attempts
+;disable_brute_force_login_protection = false
+
+# set to true if you host Grafana behind HTTPS. default is false.
+;cookie_secure = false
+
+# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
+;cookie_samesite = lax
+
+# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
+;allow_embedding = false
+
+#################################### Snapshots ###########################
+[snapshots]
+# snapshot sharing options
+;external_enabled = true
+;external_snapshot_url = https://snapshots-origin.raintank.io
+;external_snapshot_name = Publish to snapshot.raintank.io
+
+# remove expired snapshot
+;snapshot_remove_expired = true
+
+#################################### Dashboards History ##################
+[dashboards]
+# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
+;versions_to_keep = 20
+
+#################################### Users ###############################
+[users]
+# disable user signup / registration
+;allow_sign_up = true
+
+# Allow non admin users to create organizations
+;allow_org_create = true
+
+# Set to true to automatically assign new users to the default organization (id 1)
+;auto_assign_org = true
+
+# Default role new users will be automatically assigned (if disabled above is set to true)
+;auto_assign_org_role = Viewer
+
+# Background text for the user field on the login page
+;login_hint = email or username
+;password_hint = password
+
+# Default UI theme ("dark" or "light")
+;default_theme = dark
+
+# External user management, these options affect the organization users view
+;external_manage_link_url =
+;external_manage_link_name =
+;external_manage_info =
+
+# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
+;viewers_can_edit = false
+
+# Editors can administrate dashboard, folders and teams they create
+;editors_can_admin = false
+
+[auth]
+# Login cookie name
+;login_cookie_name = grafana_session
+
+# The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days,
+;login_maximum_inactive_lifetime_days = 7
+
+# The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
+;login_maximum_lifetime_days = 30
+
+# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
+;token_rotation_interval_minutes = 10
+
+# Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
+;disable_login_form = false
+
+# Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false
+;disable_signout_menu = false
+
+# URL to redirect the user to after sign out
+;signout_redirect_url =
+
+# Set to true to attempt login with OAuth automatically, skipping the login screen.
+# This setting is ignored if multiple OAuth providers are configured.
+;oauth_auto_login = false
+
+#################################### Anonymous Auth ######################
+[auth.anonymous]
+# enable anonymous access
+;enabled = false
+
+# specify organization name that should be used for unauthenticated users
+;org_name = Main Org.
+
+# specify role for unauthenticated users
+;org_role = Viewer
+
+#################################### Github Auth ##########################
+[auth.github]
+;enabled = false
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email,read:org
+;auth_url = https://github.com/login/oauth/authorize
+;token_url = https://github.com/login/oauth/access_token
+;api_url = https://api.github.com/user
+;team_ids =
+;allowed_organizations =
+
+#################################### Google Auth ##########################
+[auth.google]
+;enabled = false
+;allow_sign_up = true
+;client_id = some_client_id
+;client_secret = some_client_secret
+;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
+;auth_url = https://accounts.google.com/o/oauth2/auth
+;token_url = https://accounts.google.com/o/oauth2/token
+;api_url = https://www.googleapis.com/oauth2/v1/userinfo
+;allowed_domains =
+
+#################################### Generic OAuth ##########################
+[auth.generic_oauth]
+;enabled = false
+;name = OAuth
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email,read:org
+;auth_url = https://foo.bar/login/oauth/authorize
+;token_url = https://foo.bar/login/oauth/access_token
+;api_url = https://foo.bar/user
+;team_ids =
+;allowed_organizations =
+;tls_skip_verify_insecure = false
+;tls_client_cert =
+;tls_client_key =
+;tls_client_ca =
+
+; Set to true to enable sending client_id and client_secret via POST body instead of Basic authentication HTTP header
+; This might be required if the OAuth provider is not RFC6749 compliant, only supporting credentials passed via POST payload
+;send_client_credentials_via_post = false
+
+#################################### Grafana.com Auth ####################
+[auth.grafana_com]
+;enabled = false
+;allow_sign_up = true
+;client_id = some_id
+;client_secret = some_secret
+;scopes = user:email
+;allowed_organizations =
+
+#################################### Auth Proxy ##########################
+[auth.proxy]
+;enabled = false
+;header_name = X-WEBAUTH-USER
+;header_property = username
+;auto_sign_up = true
+;ldap_sync_ttl = 60
+;whitelist = 192.168.1.1, 192.168.2.1
+;headers = Email:X-User-Email, Name:X-User-Name
+
+#################################### Basic Auth ##########################
+[auth.basic]
+;enabled = true
+
+#################################### Auth LDAP ##########################
+[auth.ldap]
+;enabled = false
+;config_file = /etc/grafana/ldap.toml
+;allow_sign_up = true
+
+#################################### SMTP / Emailing ##########################
+[smtp]
+;enabled = false
+;host = localhost:25
+;user =
+# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
+;password =
+;cert_file =
+;key_file =
+;skip_verify = false
+;from_address = admin@grafana.localhost
+;from_name = Grafana
+# EHLO identity in SMTP dialog (defaults to instance_name)
+;ehlo_identity = dashboard.example.com
+
+[emails]
+;welcome_email_on_sign_up = false
+
+#################################### Logging ##########################
+[log]
+# Either "console", "file", "syslog". Default is console and  file
+# Use space to separate multiple modes, e.g. "console file"
+;mode = console file
+
+# Either "debug", "info", "warn", "error", "critical", default is "info"
+;level = info
+
+# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
+;filters =
+
+# For "console" mode only
+[log.console]
+;level =
+
+# log line format, valid options are text, console and json
+;format = console
+
+# For "file" mode only
+[log.file]
+;level =
+
+# log line format, valid options are text, console and json
+;format = text
+
+# This enables automated log rotate(switch of following options), default is true
+;log_rotate = true
+
+# Max line number of single file, default is 1000000
+;max_lines = 1000000
+
+# Max size shift of single file, default is 28 means 1 << 28, 256MB
+;max_size_shift = 28
+
+# Segment log daily, default is true
+;daily_rotate = true
+
+# Expired days of log file(delete after max days), default is 7
+;max_days = 7
+
+[log.syslog]
+;level =
+
+# log line format, valid options are text, console and json
+;format = text
+
+# Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used.
+;network =
+;address =
+
+# Syslog facility. user, daemon and local0 through local7 are valid.
+;facility =
+
+# Syslog tag. By default, the process' argv[0] is used.
+;tag =
+
+#################################### Alerting ############################
+[alerting]
+# Disable alerting engine & UI features
+;enabled = true
+# Makes it possible to turn off alert rule execution but alerting UI is visible
+;execute_alerts = true
+
+# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
+;error_or_timeout = alerting
+
+# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
+;nodata_or_nullvalues = no_data
+
+# Alert notifications can include images, but rendering many images at the same time can overload the server
+# This limit will protect the server from render overloading and make sure notifications are sent out quickly
+;concurrent_render_limit = 5
+
+
+# Default setting for alert calculation timeout. Default value is 30
+;evaluation_timeout_seconds = 30
+
+# Default setting for alert notification timeout. Default value is 30
+;notification_timeout_seconds = 30
+
+# Default setting for max attempts to sending alert notifications. Default value is 3
+;max_attempts = 3
+
+#################################### Explore #############################
+[explore]
+# Enable the Explore section
+;enabled = true
+
+#################################### Internal Grafana Metrics ##########################
+# Metrics available at HTTP API Url /metrics
+[metrics]
+# Disable / Enable internal metrics
+;enabled           = true
+
+# Publish interval
+;interval_seconds  = 10
+
+# Send internal metrics to Graphite
+[metrics.graphite]
+# Enable by setting the address setting (ex localhost:2003)
+;address =
+;prefix = prod.grafana.%(instance_name)s.
+
+#################################### Distributed tracing ############
+[tracing.jaeger]
+# Enable by setting the address sending traces to jaeger (ex localhost:6831)
+;address = localhost:6831
+# Tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2)
+;always_included_tag = tag1:value1
+# Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote
+;sampler_type = const
+# jaeger samplerconfig param
+# for "const" sampler, 0 or 1 for always false/true respectively
+# for "probabilistic" sampler, a probability between 0 and 1
+# for "rateLimiting" sampler, the number of spans per second
+# for "remote" sampler, param is the same as for "probabilistic"
+# and indicates the initial sampling rate before the actual one
+# is received from the mothership
+;sampler_param = 1
+
+#################################### Grafana.com integration  ##########################
+# Url used to import dashboards directly from Grafana.com
+[grafana_com]
+;url = https://grafana.com
+
+#################################### External image storage ##########################
+[external_image_storage]
+# Used for uploading images to public servers so they can be included in slack/email messages.
+# you can choose between (s3, webdav, gcs, azure_blob, local)
+;provider =
+
+[external_image_storage.s3]
+;bucket =
+;region =
+;path =
+;access_key =
+;secret_key =
+
+[external_image_storage.webdav]
+;url =
+;public_url =
+;username =
+;password =
+
+[external_image_storage.gcs]
+;key_file =
+;bucket =
+;path =
+
+[external_image_storage.azure_blob]
+;account_name =
+;account_key =
+;container_name =
+
+[external_image_storage.local]
+# does not require any configuration
+
+[rendering]
+# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
+;server_url =
+;callback_url =
+
+[enterprise]
+# Path to a valid Grafana Enterprise license.jwt file
+;license_path =
+
+[panels]
+# If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
+;disable_sanitize_html = false
+
+[plugins]
+;enable_alpha = false
+;app_tls_skip_verify_insecure = false
diff --git a/configuration/nginx.conf b/configuration/nginx.conf
new file mode 100644
index 0000000..a073701
--- /dev/null
+++ b/configuration/nginx.conf
@@ -0,0 +1,78 @@
+server {
+    listen          80;
+    server_name     zabbix;
+    index           index.php;
+
+    access_log      /dev/fd/1 main;
+    error_log       /dev/fd/2 notice;
+
+    set $webroot '/usr/share/zabbix';
+
+    root $webroot;
+
+    large_client_header_buffers 8 8k;
+    client_max_body_size 10M;
+
+
+    location = /favicon.ico {
+        log_not_found off;
+    }
+
+    location = /robots.txt {
+        allow all;
+        log_not_found off;
+        access_log off;
+    }
+
+    # deny running scripts inside writable directories
+    location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ {
+        return 403;
+        error_page 403 /403_error.html;
+    }
+
+    # Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac).
+    location ~ /\. {
+        deny all;
+        access_log off;
+        log_not_found off;
+    }
+
+    # caching of files
+    location ~* \.(ico|pdf|flv)$ {
+        expires 1y;
+    }
+
+    location ~* \.(js|css|png|jpg|jpeg|gif|swf|xml|txt)$ {
+        expires 14d;
+    }
+
+    location / {
+        try_files $uri $uri/ /index.php?$args;
+    }
+
+    location ~ .php$ {
+        fastcgi_pass   unix:/var/run/php/php7.2-fpm.sock;
+        fastcgi_index  index.php;
+
+        fastcgi_param  SCRIPT_FILENAME  $webroot$fastcgi_script_name;
+
+        include fastcgi_params;
+        fastcgi_param  QUERY_STRING     $query_string;
+        fastcgi_param  REQUEST_METHOD   $request_method;
+        fastcgi_param  CONTENT_TYPE     $content_type;
+        fastcgi_param  CONTENT_LENGTH   $content_length;
+        fastcgi_intercept_errors        on;
+        fastcgi_ignore_client_abort     off;
+        fastcgi_connect_timeout 60;
+        fastcgi_send_timeout 180;
+        fastcgi_read_timeout 180;
+        fastcgi_buffer_size 128k;
+        fastcgi_buffers 4 256k;
+        fastcgi_busy_buffers_size 256k;
+        fastcgi_temp_file_write_size 256k;
+    }
+
+    location ^~ /grafana/ {
+        proxy_pass         http://grafana:3000/;
+    }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index a773b26..1b1cbce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,8 @@
 #
 
 version: "3"
+
+
 services:
 
   server:
@@ -48,6 +50,8 @@ services:
       - MYSQL_DATABASE=${MYSQL_DATABASE:-zabbix}
       - MYSQL_USER=${MYSQL_USER:-zabbix}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD:-zabbix}
+    volumes:
+      - ./configuration/nginx.conf:/etc/zabbix/nginx.conf:ro
     restart: unless-stopped
     logging:
       driver: "json-file"
@@ -88,6 +92,52 @@ services:
         max-size: "10M"
         max-file: "5"
 
+  grafana:
+    hostname: grafana
+    build:
+      dockerfile: Dockerfile.grafana
+      context: ./
+    restart: unless-stopped
+    networks:
+      - zabbix_net
+    volumes:
+      - ./data/grafana:/var/lib/grafana
+      - ./data/provisioning/dashboards:/etc/grafana/provisioning/dashboards
+      - ./data/provisioning/datasources:/etc/grafana/provisioning/datasources
+      - ./scripts/zabbix_dashboards:/var/lib/grafana/dashboards
+      - ./configuration/grafana.ini:/etc/grafana/grafana.ini:ro
+    environment:
+      - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-grafana}
+      - GF_AUTH_LDAP_ENABLED=${GF_AUTH_LDAP_ENABLED:-false}
+      - GF_AUTH_LDAP_CONFIG_FILE=/etc/grafana/ldap_custom.toml
+      - GF_AUTH_LDAP_ALLOW_SIGN_UP=${GF_AUTH_LDAP_ALLOW_SIGN_UP:-true}
+      ##########LDAP CONFIG ENVIROMENTS##########
+      - LDAP_GF_HOST=${LDAP_GF_HOST:-172.17.0.1}
+      - LDAP_GF_PORT=${LDAP_GF_PORT:-389}
+      - LDAP_GF_USE_SSL=${LDAP_GF_USE_SSL:-false}
+      - LDAP_GF_START_TLS=${LDAP_GF_START_TLS:-false}
+      - LDAP_GF_SKIP_VERIFY=${LDAP_GF_SKIP_VERIFY:-false}
+      - LDAP_GF_BIND_DN=${LDAP_GF_BIND_DN:-cn=admin,dc=example,dc=org}
+      - LDAP_GF_BIND_PASSWORD=${LDAP_GF_BIND_PASSWORD:-admin}
+      - LDAP_GF_SEARCH_FILTER=${LDAP_GF_SEARCH_FILTER:-(cn=%s)}
+      - LDAP_GF_SEARCH_BASE_DNS=${LDAP_GF_SEARCH_BASE_DNS:-dc=example,dc=org}
+      - LDAP_GF_NAME=${LDAP_GF_NAME:-giveName}
+      - LDAP_GF_SURNAME=${LDAP_GF_SURNAME:-sn}
+      - LDAP_GF_USERNAME=${LDAP_GF_USERNAME:-cn}
+      - LDAP_GF_MEMBER_OF=${LDAP_GF_MEMBER_OF:-memberOf}
+      - LDAP_GF_EMAIL=${LDAP_GF_EMAIL:-email}
+      - LDAP_GF_GROUP_DN_ADMIN=${LDAP_GF_GROUP_DN_ADMIN:-cn=admins,dc=example,dc=org}
+      - LDAP_GF_ORG_ROLE_ADMIN=${LDAP_GF_ORG_ROLE_ADMIN:-Admin}
+      - LDAP_GF_GROUP_DN_EDITOR={LDAP_GF_GROUP_DN_EDITOR:-cn=users,dc=example,dc=org}
+      - LDAP_GF_ORG_ROLE_EDITOR={LDAP_GF_ORG_ROLE_EDITOR:-Editor}
+      - LDAP_GF_GROUP_DN_VIEWER=${LDAP_GF_GROUP_DN_VIEWER:-*}
+      - LDAP_GF_ORG_ROLE_VIEWER=${LDAP_GF_ORG_ROLE_VIEWER:-Viewer}
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "10M"
+        max-file: "5"
+
   configurator:
     hostname: configuration
     build:
@@ -98,6 +148,9 @@ services:
       - ./scripts/configurator.py:/configurator.py:ro
       - ./configuration:/configuration:ro
       - /etc/zabbix:/etc/zabbix
+      - ./data/provisioning/dashboards:/grafana/provisioning/dashboards
+      - ./data/provisioning/datasources:/grafana/provisioning/datasources
+      - ./scripts/zabbix_dashboards:/grafana/zabbix_dashboards
     links:
       - db
       - frontend
@@ -129,6 +182,13 @@ services:
       - ZBX_CUSTOM_CONFIG=custom.json
       # Usage: ZBX_ADDITIONAL_TEMPLATES=template1,template2
       - ZBX_ADDITIONAL_TEMPLATES=Template Web Check, Template App Docker
+      #GRAFANA ENVIRONMENTS
+      - GRA_DSOURCE_YAML=/grafana/provisioning/datasources/datasource.yaml
+      - GRA_DBOARD_YAML=/grafana/provisioning/dashboards/dashboard.yaml
+      - GRA_ADMIN_PASS=${GF_SECURITY_ADMIN_PASSWORD}
+      - GRA_PATH_TO_DASHBOARDS=/grafana/zabbix_dashboards
+      - GRA_HOST=grafana
+      - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-grafana}
 networks:
   zabbix_net:
     driver: bridge
diff --git a/readme.md b/readme.md
index b311740..bf90a7a 100644
--- a/readme.md
+++ b/readme.md
@@ -2,15 +2,16 @@
 [![Build Status](https://travis-ci.org/Onix-Systems/zabbix-deployment.svg?branch=master)](https://travis-ci.org/Onix-Systems/zabbix-deployment)
 
 ### About
-Repository contain docker-compose project for running zabbix server on your own server.
+Repository contain docker-compose project for running zabbix and grafana servers on your own server.
 
 1. Zabbix server 3.4
 1. Zabbix frontend
 1. Zabbix agent (will be installed on host, not run inside the docker container)
 1. MariaDB 10.3
 1. Exim4 SMTP service
+1. Grafana Server
 
-PS: It is used the official docker image: https://hub.docker.com/u/zabbix/
+PS: It is used the official docker image: https://hub.docker.com/u/zabbix/ and https://hub.docker.com/r/grafana/grafana/
 
 ###
 Requirements
@@ -86,6 +87,19 @@ To run project with specific options, please see `.env.example` file.
 To apply non default option, copy `.env.example` file to `.env` and
 edit necessary values there.
 
+#### About Grafana
+
+Grafana conneted to zabbix server by https://grafana.com/plugins/alexanderzobnin-zabbix-app plugin.
+
+All provisioning files for grafana are generated by configurator
+
+The folder for Zabbix Dashboards are ./scripts/Zabbix_Dashboards/ You cat try to make your own dashboards and put to this folder, then restart your container of grafana, if you do all right, after restart you can see you dashboard in grafana
+
+After all succesfully completed you can see grafana web in http://localhost/grafana
+
+Default user and password are: admin/grafana, you also can change password in `.env` file
+
+
 #### Testing a deployment of environment
 
 Project contains Vagrantfile that can be used for testing running the project.
diff --git a/scripts/configurator.py b/scripts/configurator.py
index 5f5286d..5b8555f 100755
--- a/scripts/configurator.py
+++ b/scripts/configurator.py
@@ -29,6 +29,11 @@ def error(msg=""):
 
 class Configurator:
     def __init__(self):
+        self.grafana_password = os.environ["GF_SECURITY_ADMIN_PASSWORD"]
+        self.grafana_datas_yaml = os.environ["GRA_DSOURCE_YAML"]
+        self.grafana_dashb_yaml = os.environ["GRA_DBOARD_YAML"]
+        self.grafana_hostname = os.environ["GRA_HOST"]
+        self.grafana_pt_dashboards = os.environ["GRA_PATH_TO_DASHBOARDS"]
         self.url = os.environ["ZBX_SERVER_URL"]
         self.server_host = os.environ["ZBX_SERVER_HOST"]
         self.default_admin_username = "admin"
@@ -95,6 +100,74 @@ def __init__(self):
         self.admin_users = json.loads(os.environ["ZBX_ADMIN_USERS"]) if "ZBX_ADMIN_USERS" in os.environ and os.environ["ZBX_ADMIN_USERS"].strip() != "" else []
         self.additional_templates = [x.strip() for x in os.environ["ZBX_ADDITIONAL_TEMPLATES"].split(",")] if "ZBX_ADDITIONAL_TEMPLATES" in os.environ else []
 
+    def grafana_plugin_on(self):
+        logger.debug("Grafana Plugin Curl Start")
+        plugURL = ("{0}:3000/api/plugins/alexanderzobnin-zabbix-app/settings?enabled=true".format(self.grafana_hostname))
+        c = pycurl.Curl()
+        c.setopt(c.USERPWD, "%s:%s" % ("admin", self.grafana_password))
+        c.setopt(c.URL, plugURL)
+        c.setopt(c.POSTFIELDS, '{ '' }')
+        c.setopt(c.VERBOSE, True)
+        c.perform()
+
+    def grafana_dashboard_starred(self):
+        logger.debug("Grafana Dashboard Starred")
+        path, dirs, files = os.walk(self.grafana_pt_dashboards).next()
+        file_count = len(files)
+        print (file_count)
+
+        dashboard_id = 1
+        #Condition for find more then one dashboard.json file (need for add to favorite)
+        while dashboard_id <= file_count:
+              #print (dashboard_id)
+              plugURL = ("{0}:3000/api/user/stars/dashboard/{1}".format(self.grafana_hostname, dashboard_id))
+              c = pycurl.Curl()
+              c.setopt(c.USERPWD, "%s:%s" % ("admin", self.grafana_password))
+              c.setopt(c.URL, plugURL)
+              c.setopt(c.POSTFIELDS, '{ '' }')
+              c.setopt(c.VERBOSE, True)
+              c.perform()
+              dashboard_id = dashboard_id + 1 #So simply :)
+
+    def grafana_configurator(self):
+
+        #Datasource.yaml Template generation
+        with open(self.configuration_folder+"/datasource.yaml.tmpl", 'r') as myfile:
+            data = myfile.read().format(self.url, self.admin_password)
+            ds_file = open(self.grafana_datas_yaml, "w")
+            ds_file.write(data)
+            ds_file.close()
+
+        #Dashboard.yaml Template generation
+        with open(self.configuration_folder+"/dashboard.yaml.tmpl", 'r') as myfile:
+            data = myfile.read()
+            db_file = open(self.grafana_dashb_yaml, "w")
+            db_file.write(data)
+            db_file.close()
+
+
+        #Grafana Port Checker (need for check, if server start?)
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        timeconn = 1
+        timeconn_timeout = 10
+        while True:
+            time.sleep(1)
+
+            if timeconn == timeconn_timeout:
+                break
+
+            result = sock.connect_ex((self.grafana_hostname,3000))
+            if result == 0:
+                logger.debug("Grafana Server is Started")
+                self.grafana_plugin_on() #Enable Plugin
+                self.grafana_dashboard_starred() #Add all dashboards to favorite
+                break
+            else:
+                logger.debug("Grafana Server still not start, Try...")
+                timeconn = timeconn + 1
+        sock.close()
+
+
     def login(self):
         logger.debug("Login into Zabbix server (%s)."%(self.url))
         login_error = False
@@ -580,7 +653,7 @@ def assign_template(self, host_id, template_name):
         return 1
 
     def main(self):
-
+        self.grafana_configurator()
         if self.authentication_type != self.default_authentication_type:
             logger.debug("Changing authentication_type to default to use api with basic credentials.")
             self.update_configuration(config={"authentication_type":self.default_authentication_type})
diff --git a/scripts/run.sh b/scripts/run.sh
new file mode 100644
index 0000000..d915959
--- /dev/null
+++ b/scripts/run.sh
@@ -0,0 +1,115 @@
+#!/bin/bash -e
+
+	if [ "$GF_AUTH_LDAP_ENABLED" = "true" ]; then
+		echo "LDAP Auth is Enabled, Generating Config File..."
+		ldap_conf=${GF_AUTH_LDAP_CONFIG_FILE}
+		echo "[[servers]]
+		host = '${LDAP_GF_HOST}'
+		port = ${LDAP_GF_PORT}
+		use_ssl = ${LDAP_GF_USE_SSL}
+		start_tls = ${LDAP_GF_START_TLS}
+		ssl_skip_verify = ${LDAP_GF_SKIP_VERIFY}
+		bind_dn = '${LDAP_GF_BIND_DN}'
+		bind_password = '${LDAP_GF_BIND_PASSWORD}'
+		search_filter = '${LDAP_GF_SEARCH_FILTER}'
+		search_base_dns = ['${LDAP_GF_SEARCH_BASE_DNS}']
+		[servers.attributes]
+		name = '${LDAP_GF_NAME}'
+		surname = '${LDAP_GF_SURNAME}'
+		username = '${LDAP_GF_USERNAME}'
+		member_of = '${LDAP_GF_MEMBER_OF}'
+		email =  '${LDAP_GF_EMAIL}'
+		[[servers.group_mappings]]
+		group_dn = '${LDAP_GF_GROUP_DN_ADMIN}'
+		org_role = '${LDAP_GF_ORG_ROLE_ADMIN}'
+		[[servers.group_mappings]]
+		group_dn = '${LDAP_GF_GROUP_DN_EDITOR}'
+		org_role = '${LDAP_GF_ORG_ROLE_EDITOR}'
+		[[servers.group_mappings]]
+		group_dn = '${LDAP_GF_GROUP_DN_VIEWER}'
+		org_role = '${LDAP_GF_ORG_ROLE_VIEWER}'" > $ldap_conf
+		echo "Generating LDAP Config - Done!"
+	else
+		echo "LDAP Auth is Disable, Config Generation skipping..."
+	fi
+
+PERMISSIONS_OK=0
+
+if [ ! -r "$GF_PATHS_CONFIG" ]; then
+    echo "GF_PATHS_CONFIG='$GF_PATHS_CONFIG' is not readable."
+    PERMISSIONS_OK=1
+fi
+
+if [ ! -w "$GF_PATHS_DATA" ]; then
+    echo "GF_PATHS_DATA='$GF_PATHS_DATA' is not writable."
+    PERMISSIONS_OK=1
+fi
+
+if [ ! -r "$GF_PATHS_HOME" ]; then
+    echo "GF_PATHS_HOME='$GF_PATHS_HOME' is not readable."
+    PERMISSIONS_OK=1
+fi
+
+if [ $PERMISSIONS_OK -eq 1 ]; then
+    echo "You may have issues with file permissions, more information here: http://docs.grafana.org/installation/docker/#migration-from-a-previous-version-of-the-docker-container-to-5-1-or-later"
+fi
+
+if [ ! -d "$GF_PATHS_PLUGINS" ]; then
+    mkdir "$GF_PATHS_PLUGINS"
+fi
+
+if [ ! -z ${GF_AWS_PROFILES+x} ]; then
+    > "$GF_PATHS_HOME/.aws/credentials"
+
+    for profile in ${GF_AWS_PROFILES}; do
+        access_key_varname="GF_AWS_${profile}_ACCESS_KEY_ID"
+        secret_key_varname="GF_AWS_${profile}_SECRET_ACCESS_KEY"
+        region_varname="GF_AWS_${profile}_REGION"
+
+        if [ ! -z "${!access_key_varname}" -a ! -z "${!secret_key_varname}" ]; then
+            echo "[${profile}]" >> "$GF_PATHS_HOME/.aws/credentials"
+            echo "aws_access_key_id = ${!access_key_varname}" >> "$GF_PATHS_HOME/.aws/credentials"
+            echo "aws_secret_access_key = ${!secret_key_varname}" >> "$GF_PATHS_HOME/.aws/credentials"
+            if [ ! -z "${!region_varname}" ]; then
+                echo "region = ${!region_varname}" >> "$GF_PATHS_HOME/.aws/credentials"
+            fi
+        fi
+    done
+
+    chmod 600 "$GF_PATHS_HOME/.aws/credentials"
+fi
+
+# Convert all environment variables with names ending in __FILE into the content of
+# the file that they point at and use the name without the trailing __FILE.
+# This can be used to carry in Docker secrets.
+for VAR_NAME in $(env | grep '^GF_[^=]\+__FILE=.\+' | sed -r "s/([^=]*)__FILE=.*/\1/g"); do
+    VAR_NAME_FILE="$VAR_NAME"__FILE
+    if [ "${!VAR_NAME}" ]; then
+        echo >&2 "ERROR: Both $VAR_NAME and $VAR_NAME_FILE are set (but are exclusive)"
+        exit 1
+    fi
+    echo "Getting secret $VAR_NAME from ${!VAR_NAME_FILE}"
+    export "$VAR_NAME"="$(< "${!VAR_NAME_FILE}")"
+    unset "$VAR_NAME_FILE"
+done
+
+export HOME="$GF_PATHS_HOME"
+
+if [ ! -z "${GF_INSTALL_PLUGINS}" ]; then
+  OLDIFS=$IFS
+  IFS=','
+  for plugin in ${GF_INSTALL_PLUGINS}; do
+    IFS=$OLDIFS
+    grafana-cli --pluginsDir "${GF_PATHS_PLUGINS}" plugins install ${plugin}
+  done
+fi
+
+exec grafana-server                                         \
+  --homepath="$GF_PATHS_HOME"                               \
+  --config="$GF_PATHS_CONFIG"                               \
+  "$@"                                                      \
+  cfg:default.log.mode="console"                            \
+  cfg:default.paths.data="$GF_PATHS_DATA"                   \
+  cfg:default.paths.logs="$GF_PATHS_LOGS"                   \
+  cfg:default.paths.plugins="$GF_PATHS_PLUGINS"             \
+  cfg:default.paths.provisioning="$GF_PATHS_PROVISIONING"
diff --git a/scripts/zabbix_dashboards/zabbix.json b/scripts/zabbix_dashboards/zabbix.json
new file mode 100644
index 0000000..da6e415
--- /dev/null
+++ b/scripts/zabbix_dashboards/zabbix.json
@@ -0,0 +1,355 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 2,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": true,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Zabbix",
+      "fill": 1,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 0,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {},
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "application": {
+            "filter": "CPU"
+          },
+          "functions": [],
+          "group": {
+            "filter": "Zabbix servers"
+          },
+          "host": {
+            "filter": "Zabbix server"
+          },
+          "item": {
+            "filter": "CPU idle time"
+          },
+          "mode": 0,
+          "options": {
+            "showDisabledItems": false,
+            "skipEmptyValues": false
+          },
+          "refId": "A",
+          "resultFormat": "time_series",
+          "table": {
+            "skipEmptyValues": false
+          },
+          "triggers": {
+            "acknowledged": 2,
+            "count": true,
+            "minSeverity": 3
+          }
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "CPU",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "cacheTimeout": null,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "id": 6,
+      "links": [],
+      "options": {
+        "fieldOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "defaults": {
+            "max": 100,
+            "min": 0
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "green",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "red",
+              "index": 1,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "auto",
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true
+      },
+      "pluginVersion": "6.2.2",
+      "targets": [
+        {
+          "application": {
+            "filter": "Filesystems"
+          },
+          "functions": [],
+          "group": {
+            "filter": "Zabbix servers"
+          },
+          "host": {
+            "filter": "Zabbix server"
+          },
+          "item": {
+            "filter": "Free disk space on / (percentage)"
+          },
+          "mode": 0,
+          "options": {
+            "showDisabledItems": false,
+            "skipEmptyValues": false
+          },
+          "refId": "A",
+          "resultFormat": "time_series",
+          "table": {
+            "skipEmptyValues": false
+          },
+          "triggers": {
+            "acknowledged": 2,
+            "count": true,
+            "minSeverity": 3
+          }
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Free % space on Disc",
+      "type": "gauge"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "fill": 1,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 9
+      },
+      "id": 4,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 2,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {},
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "application": {
+            "filter": "Memory"
+          },
+          "functions": [],
+          "group": {
+            "filter": "Zabbix servers"
+          },
+          "host": {
+            "filter": "Zabbix server"
+          },
+          "item": {
+            "filter": "Available memory"
+          },
+          "mode": 0,
+          "options": {
+            "showDisabledItems": false,
+            "skipEmptyValues": false
+          },
+          "refId": "A",
+          "resultFormat": "time_series",
+          "table": {
+            "skipEmptyValues": false
+          },
+          "triggers": {
+            "acknowledged": 2,
+            "count": true,
+            "minSeverity": 3
+          }
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "RAM",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "schemaVersion": 18,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
+  },
+  "timezone": "",
+  "title": "Zabbix",
+  "uid": "sCvMUR7Wk",
+  "version": 7
+}
diff --git a/x-setup-agent.sh b/x-setup-agent.sh
index 9d88356..9a584b2 100755
--- a/x-setup-agent.sh
+++ b/x-setup-agent.sh
@@ -6,6 +6,7 @@ cd $(dirname $0)
 
 # Setting default variables
 ZBX_VERSION=3.4
+ZBX_DOCKER_MODULE_VER=3.4
 # Loading project options and overriding default variables
 if [ -e "../.env" ];  then source ../.env; fi
 
@@ -111,7 +112,7 @@ if [ "${ENABLE_DOCKER_MODULE}" == true ]; then
     if [ "${OS}" == "ubuntu" -a "${OSV}" == "18" ]; then
         OSV="16"
     fi
-    wget -q https://github.com/monitoringartist/zabbix-docker-monitoring/raw/gh-pages/${OS}${OSV}/${ZBX_VERSION}/${MODULE_FILENAME} \
+    wget -q https://github.com/monitoringartist/zabbix-docker-monitoring/raw/gh-pages/${OS}${OSV}/${ZBX_DOCKER_MODULE_VER}/${MODULE_FILENAME} \
         -O ${MODULE_FOLDER}/${MODULE_FILENAME}
     usermod -aG docker zabbix
 else
diff --git a/x-setup-server.sh b/x-setup-server.sh
index 8c02585..2313e74 100755
--- a/x-setup-server.sh
+++ b/x-setup-server.sh
@@ -22,6 +22,7 @@ printf "Building, launching and configuring Zabbix server. "
 docker-compose build &> /dev/null
 docker-compose up -d &> /dev/null
 echo "Done."
+
 echo "Installing and configuring host's agent."
 echo $DEFAULT_HOST_METADATA
 ./x-setup-agent.sh \