Changeset 34491


Ignore:
Timestamp:
2012-12-04T17:20:59+01:00 (5 years ago)
Author:
florian
Message:

zabbix: preserve conffile over sysupgrade

while doing a sysupgrade the conffile was lost because:

  • the path in the Makefile is incorrect
  • the parametrized /conffiles define doesn't seem to work for me

So I added a /conffiles define for every zabbix component and corrected
the path. I think the path changed while upgrading to 2.0.0.

I also had an issue with "hostname" and "uname" not being present on my
system, so I added selects onto these busybox-applets if the native
tool is not installed. Zabbix could also call lsusb and lspci, but I
think it's okay if these calls don't work on an embedded device.

Additionally I deleted an old conffile "files/zabbix_agentd.conf"
which is unused since changeset 32497 (level up zabbix to version 2.0.0)

Signed-off-by: Stefan Hellermann <stefan@…>
Signed-off-by: Florian Fainelli <florian@…>

Location:
packages/admin/zabbix
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/admin/zabbix/Makefile

    r32497 r34491  
    6464endef 
    6565 
     66define Package/zabbix-agentd/config 
     67  select BUSYBOX_CONFIG_HOSTNAME if !PACKAGE_net-tools-hostname 
     68  select BUSYBOX_CONFIG_UNAME if !PACKAGE_coreutils-uname 
     69endef 
     70 
    6671CONFIGURE_ARGS+= \ 
    6772        --enable-agent \ 
     
    109114endef 
    110115 
    111 define Package/zabbix-$(1)/conffiles 
    112   /etc/zabbix/zabbix_$(1).conf 
     116define Package/zabbix-agent/conffiles 
     117/etc/zabbix_agent.conf 
     118endef 
     119define Package/zabbix-agentd/conffiles 
     120/etc/zabbix_agentd.conf 
     121endef 
     122define Package/zabbix-server/conffiles 
     123/etc/zabbix_server.conf 
     124endef 
     125define Package/zabbix-proxy/conffiles 
     126/etc/zabbix_proxy.conf 
    113127endef 
    114128 
  • packages/admin/zabbix/files/zabbix_agentd.conf

    r28892 r34491  
    1 # This is config file for zabbix_agentd 
    2 # To get more information about ZABBIX, go http://www.zabbix.com 
    3  
    4 ############ GENERAL PARAMETERS ################# 
    5  
    6 # List of comma delimited IP addresses (or hostnames) of ZABBIX servers.  
    7 # No spaces allowed. First entry is used for sending active checks. 
    8 # Note that hostnames must resolve hostname->IP address and 
    9 # IP address->hostname. 
    10  
    11 Server=127.0.0.1 
    12  
    13 # Server port for sending active checks 
    14  
    15 #ServerPort=10051 
    16  
    17 # Unique hostname. Required for active checks. 
    18  
    19 Hostname=localhost 
    20  
    21 # Listen port. Default is 10050 
    22  
    23 #ListenPort=10050 
    24  
    25 # IP address to bind agent 
    26 # If missing, bind to all available IPs 
    27  
    28 #ListenIP=127.0.0.1 
    29  
    30 # Number of pre-forked instances of zabbix_agentd. 
    31 # Default value is 5 
    32 # This parameter must be between 1 and 16 
    33  
    34 StartAgents=5 
    35  
    36 # How often refresh list of active checks. 2 minutes by default. 
    37  
    38 #RefreshActiveChecks=120 
    39  
    40 # Disable active checks. The agent will work in passive mode listening server. 
    41  
    42 #DisableActive=1 
    43  
    44 # Enable remote commands for ZABBIX agent. By default remote commands disabled. 
    45  
    46 #EnableRemoteCommands=1 
    47  
    48 # Specifies debug level 
    49 # 0 - debug is not created 
    50 # 1 - critical information 
    51 # 2 - error information 
    52 # 3 - warnings 
    53 # 4 - information (default) 
    54 # 5 - for debugging (produces lots of information) 
    55  
    56 DebugLevel=3 
    57  
    58 # Name of PID file 
    59  
    60 PidFile=/var/run/zabbix/zabbix_agentd.pid 
    61  
    62 # Name of log file. 
    63 # If not set, syslog will be used 
    64  
    65 LogFile=/var/log/zabbix/zabbix_agentd.log 
    66  
    67 # Spend no more than Timeout seconds on processing 
    68 # Must be between 1 and 30 
    69  
    70 Timeout=3 
    71  
    72 ####### USER-DEFINED MONITORED PARAMETERS ####### 
    73 # Format: UserParameter=<key>,<shell command> 
    74 # Note that shell command must not return empty string or EOL only 
    75 #UserParameter=system.test,who|wc -l 
    76 ### Set of parameter for monitoring MySQL server (v3.23.42 and later) 
    77 ### Change -u<username> and add -p<password> if required 
    78 #UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l 
    79 #UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T" 
    80 #UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q" 
    81 #UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S" 
    82 #UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O" 
    83 #UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":" 
    84 #UserParameter=mysql.version,mysql -V 
    85  
Note: See TracChangeset for help on using the changeset viewer.