Fixing all the inconsistencies, which were also fixed with the Kibana LXC

ct/elasticsearch.sh

@@ -1,25 +1,26 @@
 #!/usr/bin/env bash
-source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func)
-# Copyright (c) 2024 ELKozel
-# Author: T.H. (ELKozel)
+source <(curl -s https://raw.githubusercontent.com/ELKozel/Proxmox/main/misc/build.func)
+# Copyright (c) 2021-2024 tteck
+# Author: tteck (tteckster)
+# Co-Author: T.H. (ELKozel)
 # License: MIT
 # https://github.com/tteck/Proxmox/raw/main/LICENSE
 
 function header_info {
 clear
 cat <<"EOF"
- _____ _           _   _                              _     
-| ____| | __ _ ___| |_(_) ___ ___  ___  __ _ _ __ ___| |__  
-|  _| | |/ _` / __| __| |/ __/ __|/ _ \/ _` | '__/ __| '_ \ 
-| |___| | (_| \__ \ |_| | (__\__ \  __/ (_| | | | (__| | | |
-|_____|_|\__,_|___/\__|_|\___|___/\___|\__,_|_|  \___|_| |_|
+    ________           __  _                                __  
+   / ____/ /___ ______/ /_(_)____________  ____ ___________/ /_ 
+  / __/ / / __ `/ ___/ __/ / ___/ ___/ _ \/ __ `/ ___/ ___/ __ \
+ / /___/ / /_/ (__  ) /_/ / /__(__  )  __/ /_/ / /  / /__/ / / /
+/_____/_/\__,_/____/\__/_/\___/____/\___/\__,_/_/   \___/_/ /_/ 
                                                                 
 EOF
 }
 header_info
 echo -e "Loading..."
 APP="Elasticsearch"
-var_disk="16"
+var_disk="6"
 var_cpu="4"
 var_ram="4096"
 var_os="debian"
@@ -54,39 +55,31 @@ function default_settings() {
 
 function update_script() {
 header_info
-  if [[ ! -f /etc/systemd/system/elasticsearch.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
+if [[ ! -f /etc/systemd/system/Elasticsearch.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
 if (( $(df /boot | awk 'NR==2{gsub("%","",$5); print $5}') > 80 )); then
   read -r -p "Warning: Storage is dangerously low, continue anyway? <y/N> " prompt
   [[ ${prompt,,} =~ ^(y|yes)$ ]] || exit
 fi
 
-  msg_info "Stopping ${APP}"
-  $STD /bin/systemctl stop elasticsearch.service
-  msg_ok "Stopped ${APP}"
+msg_info "Updating ${APP} LXC"
+apt-get update &>/dev/null
+apt-get -y upgrade &>/dev/null
+msg_ok "Updated ${APP} LXC"
 
-  msg_info "Updating ${APP}"
-  $STD apt-get install elasticsearch &>/dev/null
-  msg_ok "Updated ${APP}"
-
-  msg_info "Starting ${APP}"
-  $STD /bin/systemctl restart elasticsearch.service
-  msg_ok "Started ${APP}"
-
-  msg_ok "Updated Successfully"
 exit
 }
 
 function ask_extend_mmap() {
+  # Check if max_map_count setting is set in sysctl.conf (It is not set by default)
+  # so if it is set, we don't want to override what the user has set
+  if ! grep -q "vm.max_map_count" /etc/sysctl.conf; then
     echo "Elasticsearch recommends extending the vm.max_map_count on the host"
     read -r -p "Would you like to extend mmap count? <y/N>" prompt
     if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
-    msg_info "Extending mmap count"
-    sysctl -w vm.max_map_count=262144 >/dev/null
-    # Check if the setting is persistent
-    if ! grep -q "vm.max_map_count" /etc/sysctl.conf; then
+      msg_info "Extending max mmap count"
       echo "vm.max_map_count=262144" >>/etc/sysctl.conf
+      msg_ok "Extended max mmap count"
     fi
-    msg_ok "Extended mmap count"
   fi
 }
 
@@ -106,11 +99,11 @@ msg_ok "Configured User"
 msg_info "Checking Health"
 ELASTIC_PORT=9200
 curl -s -XGET --insecure --fail --user $ELASTIC_USER:$ELASTIC_PASSWORD https://${IP}:$ELASTIC_PORT/_cluster/health?pretty >/dev/null
-msg_ok "Checked Health"
+msg_ok "Cluster is healthy"
 
 msg_ok "Completed Successfully!\n"
-echo -e "${APP} is installed, you can check it's health by running:
-${BL}curl -XGET --insecure --fail --user $ELASTIC_USER:$ELASTIC_PASSWORD https://${IP}:$ELASTIC_PORT/_cluster/health?pretty${CL}
+echo -e "${APP} is installed, you can check it's health by opening (using the user and password generated for you):
+${BL}https://${IP}:$ELASTIC_PORT/_cluster/health?pretty${CL}
 Elasticsearch credentials are:
 User: ${BL}${ELASTIC_USER}${CL}
 Password: ${BL}${ELASTIC_PASSWORD}${CL}

install/elasticsearch-install.sh

@@ -15,34 +15,74 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y wget
+$STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
-$STD apt-get install -y ca-certificates
-$STD apt-get install apt-transport-https
+$STD apt-get install -y apt-transport-https
 $STD apt-get install -y gnupg
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up Elastic Repository"
-mkdir -p /etc/apt/keyrings
 wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg
 echo "deb [signed-by=/usr/share/keyrings/elasticsearch-keyring.gpg] https://artifacts.elastic.co/packages/8.x/apt stable main" >/etc/apt/sources.list.d/elastic-8.x.list
 msg_ok "Set up Elastic Repository"
 
 msg_info "Installing Elastcisearch"
 $STD apt-get update
-$STD apt-get install elasticsearch
+$STD apt-get install -y elasticsearch
 msg_ok "Installed Elastcisearch"
 
 msg_info "Configuring Elasticsearch Memory"
-$STD sed -i -E 's/## -Xms[0-9]+[Ggm]/-Xms3g/' /etc/elasticsearch/jvm.options
-$STD sed -i -E 's/## -Xmx[0-9]+[Ggm]/-Xmx3g/' /etc/elasticsearch/jvm.options
+sed -i -E 's/## -Xms[0-9]+[Ggm]/-Xms3g/' /etc/elasticsearch/jvm.options
+sed -i -E 's/## -Xmx[0-9]+[Ggm]/-Xmx3g/' /etc/elasticsearch/jvm.options
 msg_ok "Elastcisearch Configured to use 3GB of RAM"
 
 msg_info "Creating Service"
-$STD /bin/systemctl daemon-reload
-$STD /bin/systemctl enable elasticsearch.service
-$STD /bin/systemctl start elasticsearch.service
+cat <<EOF >/etc/systemd/system/Elasticsearch.service
+[Unit]
+Description=Elasticsearch
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=notify
+NotifyAccess=all
+RuntimeDirectory=elasticsearch
+PrivateTmp=true
+Environment=ES_HOME=/usr/share/elasticsearch
+Environment=ES_PATH_CONF=/etc/elasticsearch
+Environment=PID_DIR=/var/run/elasticsearch
+Environment=ES_SD_NOTIFY=true
+EnvironmentFile=-/etc/default/elasticsearch
+
+WorkingDirectory=/usr/share/elasticsearch
+
+User=elasticsearch
+Group=elasticsearch
+
+ExecStart=/usr/share/elasticsearch/bin/systemd-entrypoint -p \${PID_DIR}/elasticsearch.pid --quiet
+
+StandardOutput=journal
+StandardError=inherit
+
+LimitNOFILE=65535
+LimitNPROC=4096
+LimitAS=infinity
+LimitFSIZE=infinity
+
+TimeoutStopSec=0
+
+KillSignal=SIGTERM
+KillMode=process
+SendSIGKILL=no
+SuccessExitStatus=143
+
+TimeoutStartSec=900
+
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now Elasticsearch.service
 msg_ok "Created Service"
 
 motd_ssh