Skip to content

Commit 7101f9e

Browse files
committed
Merge branch 'dev'
2 parents f87657e + e04b387 commit 7101f9e

File tree

19 files changed

+1097
-524
lines changed

19 files changed

+1097
-524
lines changed

.github/workflows/mamonsu-tests-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
strategy:
2626
matrix:
2727
docker_os: ['centos:7']
28-
zabbix_version: ['5.4.10']
29-
pg_version: ['9.6', '10', '11', '12', '13', '14']
28+
zabbix_version: ['6.0.2']
29+
pg_version: ['10', '11', '12', '13', '14']
3030

3131
steps:
3232
- name: Checkout Mamonsu repo

.github/workflows/mamonsu-tests-master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
strategy:
2626
matrix:
2727
docker_os: ['ubuntu:20.04', 'centos:7']
28-
zabbix_version: ['4.0.38', '5.0.20', '5.4.10', '6.0.0']
29-
pg_version: ['9.6', '10', '11', '12', '13', '14']
28+
zabbix_version: ['4.0.39', '5.0.22', '5.4.12', '6.0.2']
29+
pg_version: ['10', '11', '12', '13', '14']
3030
exclude:
3131
# excludes PG 9.6 on CentOS 8
3232
- docker_os: 'centos:8'

documentation/configuration_file.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ The *agent.conf* configuration file is located in the */etc/mamonsu* directory b
88

99
All parameters must be specified in the `parameter = value` format.
1010

11+
> **_NOTE:_** It is necessary to give permissions to the mamonsu user to directories/files for correct interaction of agent with them.
12+
1113
***
1214

1315
### Connection Parameters
@@ -85,6 +87,11 @@ The [zabbix] section provides connection settings for the Zabbix server and can
8587

8688
        Default: 10051
8789

90+
**timeout**
91+
        Zabbix server connection timeout in seconds.
92+
93+
        Default: 15
94+
8895
<p>&nbsp;</p>
8996

9097
**[agent]**
@@ -118,6 +125,7 @@ The [sender] section controls the queue size of the data to be sent to the Zabbi
118125
***
119126

120127
### Logging Parameters
128+
121129
**[metric_log]**
122130
The [metric_log] section enables storing the collected metric data in text files locally. This section can contain the following parameters:
123131

@@ -129,7 +137,9 @@ The [metric_log] section enables storing the collected metric data in text files
129137
**directory**
130138
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Specifies the directory where log files with metric data will be stored.
131139

132-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: /var/log/mamonsu
140+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: /var/log/mamonsu
141+
142+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Permissions: mamonsu:mamonsu rwxrwx
133143

134144
**max_size_mb**
135145
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The maximum size of a log file, in MB. When the specified size is reached, it is renamed to localhost.log.archive, and an empty localhost.log file is created.
@@ -144,6 +154,8 @@ The [log] section specifies logging settings for Mamonsu and can contain the fol
144154
**file**
145155
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Specifies the log filename, which can be preceded by the full path.
146156

157+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Permissions: mamonsu:mamonsu rw-r--
158+
147159
**level**
148160
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Specifies the debug level. This option can take DEBUG, ERROR, or INFO values.
149161

@@ -153,7 +165,7 @@ The [log] section specifies logging settings for Mamonsu and can contain the fol
153165
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The format of the logged data.
154166

155167
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: [%(levelname)s] %(asctime)s - %(name)s - %(message)s
156-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;where levelname is the debug level, asctime returns the current time, name specifies the plugin that emitted this log entry or root otherwise, and message provides the actual log message.
168+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;where levelname is the debug level, asctime returns the current time, name specifies the plugin that emitted this log entry or root otherwise, and message provides the actual log message.
157169

158170
***
159171

@@ -169,7 +181,9 @@ The [plugins] section specifies custom plugins to be added for metrics collectio
169181
**directory**
170182
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Specifies the directory that contains custom plugins for metrics collection. Setting this parameter to None forbids using custom plugins.
171183

172-
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: /etc/mamonsu/plugins
184+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Default: /etc/mamonsu/plugins
185+
186+
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Permissions: mamonsu:mamonsu rwxrwx
173187

174188
If you need to configure any of the plugins you add to Mamonsu after installation, you have to add this plugin section to the agent.conf file.
175189

0 commit comments

Comments
 (0)