Project

General

Profile

Revision 3c133528

ID3c13352867a945dc66ade54c7f4c50022983dc0d
Parent a62d69dc
Child 52661754

Added by Gabriel DE PERTHUIS about 15 years ago

More PosgreSQL compat

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@288 b22e2e97-25c9-44ff-b637-2e5ceca36478

View differences:

vigiboard/controllers/vigiboard_ctl/vigiboardrequest.py
43 43
        self.filter = [HostGroups.groupname.in_(self.user_groups),
44 44
                        ServiceGroups.groupname.in_(self.user_groups),
45 45
                       not_(and_(Events.active == False,Events.status == 'AAClosed')),
46
                   Events.timestamp_active != None,
47
                   not_(Events.timestamp_active.like('0000-00-00 00:00:00'))]
46
                   Events.timestamp_active != None]
48 47
        self.orderby = [asc(Events.status),
49 48
                                desc(Events.active),
50 49
                                desc(Events.severity),
vigiboard/model/vigiboard_bdd/events.py
42 42
    Classe liée avec la table associée
43 43
    """
44 44

  
45
    def __init__(self,hostname,servicename,server_source='',severity=0,status='None',active=True,timestamp=datetime.now(),output='',event_timestamp=datetime.now(),last_check=datetime.now(),recover_output='',timestamp_active=datetime.now(),timestamp_cleared="0000-00-00 00:00:00",trouble_ticket=None,occurence=1):
45
    def __init__(self,hostname='',servicename='',server_source='',severity=0,status='None',active=True,timestamp=datetime.now(),output='',event_timestamp=datetime.now(),last_check=datetime.now(),recover_output='',timestamp_active=datetime.now(),timestamp_cleared="0000-00-00 00:00:00",trouble_ticket=None,occurence=1):
46 46
        self.hostname = hostname
47 47
        self.servicename = servicename
48 48
        self.server_source = server_source
vigiboard/model/vigiboard_bdd/host.py
12 12
# Generation par SQLAutoCode
13 13

  
14 14
host =  Table(vigiboard_config['vigiboard_bdd.basename'] + 'host', metadata,
15
        Column(u'name', String(length=255, convert_unicode=True, assert_unicode=None), index=True,primary_key=True, nullable=False),
15
        Column(u'name', String(length=255, convert_unicode=True, assert_unicode=None), index=True, primary_key=True, nullable=False),
16 16
        Column(u'checkhostcmd', String(length=255, convert_unicode=True, assert_unicode=None), primary_key=False, nullable=False),
17 17
        Column(u'community', String(length=255, convert_unicode=True, assert_unicode=None), primary_key=False, nullable=False),
18 18
        Column(u'fqhn', String(length=255, convert_unicode=True, assert_unicode=None), primary_key=False, nullable=False),
......
33 33
    Classe liée avec la table associée
34 34
    """
35 35
    
36
    def __init__(self,name,checkhostcmd='',community='',fqhn='',hosttpl='',mainip='',port=0,snmpoidsperdu=0,snmpversion=''):
36
    def __init__(self,name=None,checkhostcmd='',community='',fqhn='',hosttpl='',mainip='',port=0,snmpoidsperdu=0,snmpversion=''):
37 37
        self.name = name
38 38
        self.checkhostcmd = checkhostcmd
39 39
        self.community = community
vigiboard/model/vigiboard_bdd/service.py
28 28
    Classe liée avec la table associée
29 29
    """
30 30
    
31
    def __init__(self,name,type=0,command=''):
31
    def __init__(self,name=None,type=0,command=''):
32 32
        self.name = name
33 33
        self.type = type
34 34
        self.command = command

Also available in: Unified diff