Resolve conflict

6 files changed, 27 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
index 8dc7d6d9..aa0be710 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ local.properties
 
 # External tool builders
 .externalToolBuilders/
+*yarn.lock
 
 # Locally stored "Eclipse launch configurations"
 *.launch
diff --git a/conf/glances.conf b/conf/glances.conf
index c8262e89..e8911d25 100644
--- a/conf/glances.conf
+++ b/conf/glances.conf
@@ -252,7 +252,7 @@ critical=90
 # Allow additional file system types (comma-separated FS type)
 #allow=shm
 # Alias for root file system
-alias=/:Root
+#alias=/:Root
 
 [irq]
 # Documentation: https://glances.readthedocs.io/en/latest/aoa/irq.html
diff --git a/docker-compose/glances.conf b/docker-compose/glances.conf
index e3924ee3..24de7619 100644
--- a/docker-compose/glances.conf
+++ b/docker-compose/glances.conf
@@ -14,13 +14,16 @@ check_update=False
 history_size=1200
 # Set the way Glances should display the date (default is %Y-%m-%d %H:%M:%S %Z)
 #strftime_format="%Y-%m-%d %H:%M:%S %Z"
+# Define external directory for loading additional plugins
+# The layout follows the glances standard for plugin definitions
+#plugin_dir=/home/user/dev/plugins
 
 ##############################################################################
 # User interface
 ##############################################################################
 
 [outputs]
-# Theme name for the Curses interface: black or white
+# Theme name (for the moment only for the Curses interface: black or white)
 curse_theme=black
 # Separator in the Curses and WebUI interface (between top and others plugins)
 separator=True
@@ -42,8 +45,11 @@ max_processes_display=25
 # Set to true to disable a plugin
 # Note: you can also disable it from the command line (see --disable-plugin <plugin_name>)
 disable=False
-# Graphical percentage char used in the terminal user interface (default is |)
-percentage_char=|
+# Stats list (default is cpu,mem,load)
+# Available stats are: cpu,mem,load,swap
+list=cpu,mem,load
+# Graphical bar char used in the terminal user interface (default is |)
+bar_char=|
 # Define CPU, MEM and SWAP thresholds in %
 cpu_careful=50
 cpu_warning=70
@@ -54,6 +60,11 @@ mem_critical=90
 swap_careful=50
 swap_warning=70
 swap_critical=90
+# Source: http://blog.scoutapp.com/articles/2009/07/31/understanding-load-averages
+# With 1 CPU core, the load should be lower than 1.00 ~ 100%
+load_careful=70
+load_warning=100
+load_critical=500
 
 [system]
 # This plugin display the first line in the Glances UI with:
@@ -97,7 +108,6 @@ steal_warning=70
 steal_critical=90
 #steal_log=True
 #
-
 # Context switch limit (core / second)
 # Leave commented to just use the default config (critical is 50000*# (Logical CPU cores)
 #ctx_switches_careful=10000
@@ -172,8 +182,6 @@ tx_critical=90
 #hide=docker.*,lo
 # Define the list of wireless network interfaces to be show (comma-separated)
 #show=docker.*
-# WLAN 0 alias
-#wlan0_alias=Wireless
 # It is possible to overwrite the bitrate thresholds per interface
 # WLAN 0 Default limits (in bits per second aka bps) for interface bitrate
 #wlan0_rx_careful=4000000
@@ -184,6 +192,8 @@ tx_critical=90
 #wlan0_tx_warning=900000
 #wlan0_tx_critical=1000000
 #wlan0_tx_log=True
+# Alias for network interface name
+#alias=wlp2s0:WIFI
 
 [ip]
 disable=False
@@ -209,11 +219,7 @@ nf_conntrack_percent_warning=80
 nf_conntrack_percent_critical=90
 
 [wifi]
-disable=True
-# Define the list of hidden wireless network interfaces (comma-separated regexp)
-hide=lo,docker.*
-# Define the list of wireless network interfaces to be show (comma-separated)
-#show=docker.*
+disable=False
 # Define SIGNAL thresholds in db (lower is better...)
 # Based on: http://serverfault.com/questions/501025/industry-standard-for-minimum-wifi-signal-strength
 careful=-65
@@ -245,6 +251,8 @@ warning=70
 critical=90
 # Allow additional file system types (comma-separated FS type)
 #allow=shm
+# Alias for root file system
+#alias=/:Root
 
 [irq]
 # Documentation: https://glances.readthedocs.io/en/latest/aoa/irq.html
@@ -316,13 +324,7 @@ battery_careful=80
 battery_warning=90
 battery_critical=95
 # Sensors alias
-#temp1_alias=Motherboard 0
-#temp2_alias=Motherboard 1
-#core 0_temperature_core_alias=CPU Core 0 temp
-#core 0_fans_speed_alias=CPU Core 0 fan
-#or
-#core 0_alias=CPU Core 0
-#core 1_alias=CPU Core 1
+#alias=core 0:CPU Core 0,core 1:CPU Core 1
 
 [processcount]
 disable=False
@@ -437,7 +439,7 @@ disable=False
 [alert]
 disable=False
 # Maximum number of alerts to display (default is 10)
-; max_events=10
+;max_events=10
 
 ##############################################################################
 # Client/server
@@ -604,10 +606,8 @@ topic_structure=per-metric
 host=localhost
 port=5984
 db=glances
-# user and password are optional (comment if not configured on the server side)
-# If they are used, then the https protocol will be used
-#user=root
-#password=root
+user=admin
+password=admin
 
 [mongodb]
 # Configuration for the --export mongodb option
diff --git a/docker-requirements.txt b/docker-requirements.txt
index c93beffe..53d88681 100644
--- a/docker-requirements.txt
+++ b/docker-requirements.txt
@@ -6,5 +6,5 @@ podman; python_version >= "3.6"
 packaging; python_version >= "3.7"
 python-dateutil
 six
-urllib3<2.0 # See issue https://github.com/nicolargo/glances/issues/2617
+urllib3
 requests
diff --git a/glances/outputs/glances_restful_api.py b/glances/outputs/glances_restful_api.py
index 3b9054d1..322cc40b 100644
--- a/glances/outputs/glances_restful_api.py
+++ b/glances/outputs/glances_restful_api.py
@@ -85,7 +85,7 @@ class GlancesRestfulApi(object):
 
         # Change the default root path
         if self.url_prefix != '/':
-            self._app.include_router(APIRouter(prefix=self.url_prefix))
+            self._app.include_router(APIRouter(prefix=self.url_prefix.rstrip('/')))
 
         # Set path for WebUI
         self.STATIC_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'static/public')
diff --git a/glances/outputs/static/.gitignore b/glances/outputs/static/.gitignore
deleted file mode 100644
index 8ee01d32..00000000
--- a/glances/outputs/static/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-yarn.lock