Skip to content

Commit 1405b04

Browse files
kesselbkesselb
authored
Merge pull request #634 from nextcloud/backport/631/stable28
[stable28] fix: update wording about apps element in monitoring response
2 parents 345b6b4 + bfcd016 commit 1405b04

2 files changed

Lines changed: 85 additions & 77 deletions

File tree

‎README.md‎

Lines changed: 84 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -28,87 +28,95 @@ https://<nextcloud-fqdn>/ocs/v2.php/apps/serverinfo/api/v1/info
2828

2929
### Example XML output:
3030
```
31+
<?xml version="1.0"?>
3132
<ocs>
32-
<meta>
33-
<status>ok</status>
34-
<statuscode>200</statuscode>
35-
<message>OK</message>
36-
</meta>
37-
<data>
38-
<nextcloud>
39-
<system>
40-
<version>15.0.4.0</version>
41-
<theme/>
42-
<enable_avatars>yes</enable_avatars>
43-
<enable_previews>yes</enable_previews>
44-
<memcache.local>OC\Memcache\APCu</memcache.local>
45-
<memcache.distributed>none</memcache.distributed>
46-
<filelocking.enabled>yes</filelocking.enabled>
47-
<memcache.locking>OC\Memcache\Redis</memcache.locking>
48-
<debug>no</debug>
49-
<freespace>48472801280</freespace>
50-
<cpuload>
51-
<element>1.81</element>
52-
<element>1.39</element>
53-
<element>1.24</element>
54-
</cpuload>
55-
<mem_total>8183664</mem_total>
56-
<mem_free>5877568</mem_free>
57-
<swap_total>0</swap_total>
58-
<swap_free>0</swap_free>
59-
<apps>
60-
<num_installed>53</num_installed>
61-
<num_updates_available>1</num_updates_available>
62-
<app_updates>
63-
<files_antivirus>2.0.1</files_antivirus>
64-
</app_updates>
65-
</apps>
66-
</system>
67-
<storage>
68-
<num_users>7</num_users>
69-
<num_files>708860</num_files>
70-
<num_storages>125</num_storages>
71-
<num_storages_local>7</num_storages_local>
72-
<num_storages_home>7</num_storages_home>
73-
<num_storages_other>111</num_storages_other>
74-
</storage>
75-
<shares>
76-
<num_shares>1</num_shares>
77-
<num_shares_user>0</num_shares_user>
78-
<num_shares_groups>0</num_shares_groups>
79-
<num_shares_link>0</num_shares_link>
80-
<num_shares_link_no_password>0</num_shares_link_no_password>
81-
<num_fed_shares_sent>0</num_fed_shares_sent>
82-
<num_fed_shares_received>0</num_fed_shares_received>
83-
<permissions_4_1>1</permissions_4_1>
84-
</shares>
85-
</nextcloud>
86-
<server>
87-
<webserver>Apache/2.4</webserver>
88-
<php>
89-
<version>7.2.14</version>
90-
<memory_limit>536870912</memory_limit>
91-
<max_execution_time>3600</max_execution_time>
92-
<upload_max_filesize>535822336</upload_max_filesize>
93-
</php>
94-
<database>
95-
<type>mysql</type>
96-
<version>10.2.21</version>
97-
<size>331382784</size>
98-
</database>
99-
</server>
100-
<activeUsers>
101-
<last5minutes>2</last5minutes>
102-
<last1hour>4</last1hour>
103-
<last24hours>5</last24hours>
104-
</activeUsers>
105-
</data>
33+
<meta>
34+
<status>ok</status>
35+
<statuscode>200</statuscode>
36+
<message>OK</message>
37+
</meta>
38+
<data>
39+
<nextcloud>
40+
<system>
41+
<version>30.0.0.1</version>
42+
<theme/>
43+
<enable_avatars>yes</enable_avatars>
44+
<enable_previews>yes</enable_previews>
45+
<memcache.local>OC\Memcache\APCu</memcache.local>
46+
<memcache.distributed>none</memcache.distributed>
47+
<filelocking.enabled>yes</filelocking.enabled>
48+
<memcache.locking>OC\Memcache\Redis</memcache.locking>
49+
<debug>no</debug>
50+
<freespace>48472801280</freespace>
51+
<cpuload>
52+
<element>1.81</element>
53+
<element>1.39</element>
54+
<element>1.24</element>
55+
</cpuload>
56+
<mem_total>8183664</mem_total>
57+
<mem_free>5877568</mem_free>
58+
<swap_total>0</swap_total>
59+
<swap_free>0</swap_free>
60+
<apps>
61+
<!-- only with skipApps=false -->
62+
<num_installed>53</num_installed>
63+
<num_updates_available>1</num_updates_available>
64+
<app_updates>
65+
<files_antivirus>2.0.1</files_antivirus>
66+
</app_updates>
67+
</apps>
68+
<update>
69+
<!-- only with skipUpdate=false -->
70+
<lastupdatedat>1719244666</lastupdatedat>
71+
<available/>
72+
</update>
73+
</system>
74+
<storage>
75+
<num_users>7</num_users>
76+
<num_files>708860</num_files>
77+
<num_storages>125</num_storages>
78+
<num_storages_local>7</num_storages_local>
79+
<num_storages_home>7</num_storages_home>
80+
<num_storages_other>111</num_storages_other>
81+
</storage>
82+
<shares>
83+
<num_shares>1</num_shares>
84+
<num_shares_user>0</num_shares_user>
85+
<num_shares_groups>0</num_shares_groups>
86+
<num_shares_link>0</num_shares_link>
87+
<num_shares_link_no_password>0</num_shares_link_no_password>
88+
<num_fed_shares_sent>0</num_fed_shares_sent>
89+
<num_fed_shares_received>0</num_fed_shares_received>
90+
<permissions_4_1>1</permissions_4_1>
91+
</shares>
92+
</nextcloud>
93+
<server>
94+
<webserver>Apache/2.4</webserver>
95+
<php>
96+
<version>7.2.14</version>
97+
<memory_limit>536870912</memory_limit>
98+
<max_execution_time>3600</max_execution_time>
99+
<upload_max_filesize>535822336</upload_max_filesize>
100+
</php>
101+
<database>
102+
<type>mysql</type>
103+
<version>10.2.21</version>
104+
<size>331382784</size>
105+
</database>
106+
</server>
107+
<activeUsers>
108+
<last5minutes>2</last5minutes>
109+
<last1hour>4</last1hour>
110+
<last24hours>5</last24hours>
111+
</activeUsers>
112+
</data>
106113
</ocs>
114+
107115
```
108116

109117
### Example JSON output:
110-
```
111-
{"ocs":{"meta":{"status":"ok","statuscode":200,"message":"OK"},"data":{"nextcloud":{"system":{"version":"15.0.4.0","theme":"","enable_avatars":"yes","enable_previews":"yes","memcache.local":"OC\\Memcache\\APCu","memcache.distributed":"none","filelocking.enabled":"yes","memcache.locking":"OC\\Memcache\\Redis","debug":"no","freespace":48472944640,"cpuload":[0.84999999999999997779553950749686919152736663818359375,1.04000000000000003552713678800500929355621337890625,1.1699999999999999289457264239899814128875732421875],"mem_total":8183664,"mem_free":5877156,"swap_total":0,"swap_free":0,"apps":{"num_installed":53,"num_updates_available":1,"app_updates":{"files_antivirus":"2.0.1"}}},"storage":{"num_users":7,"num_files":708860,"num_storages":125,"num_storages_local":7,"num_storages_home":7,"num_storages_other":111},"shares":{"num_shares":1,"num_shares_user":0,"num_shares_groups":0,"num_shares_link":0,"num_shares_link_no_password":0,"num_fed_shares_sent":0,"num_fed_shares_received":0,"permissions_4_1":"1"}},"server":{"webserver":"Apache\/2.4","php":{"version":"7.2.14","memory_limit":536870912,"max_execution_time":3600,"upload_max_filesize":535822336},"database":{"type":"mysql","version":"10.2.21","size":331382784}},"activeUsers":{"last5minutes":2,"last1hour":3,"last24hours":5}}}}
118+
```json
119+
{"ocs":{"meta":{"status":"ok","statuscode":200,"message":"OK"},"data":{"nextcloud":{"system":{"version":"30.0.0.1","theme":"","enable_avatars":"yes","enable_previews":"yes","memcache.local":"OC\\Memcache\\APCu","memcache.distributed":"none","filelocking.enabled":"yes","memcache.locking":"OC\\Memcache\\Redis","debug":"no","freespace":48472944640,"cpuload":[0.84999999999999997779553950749686919152736663818359375,1.04000000000000003552713678800500929355621337890625,1.1699999999999999289457264239899814128875732421875],"mem_total":8183664,"mem_free":5877156,"swap_total":0,"swap_free":0,"apps":{"num_installed":53,"num_updates_available":1,"app_updates":{"files_antivirus":"2.0.1"}}},"storage":{"num_users":7,"num_files":708860,"num_storages":125,"num_storages_local":7,"num_storages_home":7,"num_storages_other":111},"shares":{"num_shares":1,"num_shares_user":0,"num_shares_groups":0,"num_shares_link":0,"num_shares_link_no_password":0,"num_fed_shares_sent":0,"num_fed_shares_received":0,"permissions_4_1":"1"}},"server":{"webserver":"Apache\/2.4","php":{"version":"7.2.14","memory_limit":536870912,"max_execution_time":3600,"upload_max_filesize":535822336},"database":{"type":"mysql","version":"10.2.21","size":331382784}},"activeUsers":{"last5minutes":2,"last1hour":3,"last24hours":5}}}}
112120
```
113121

114122
## Configuration

‎templates/settings-admin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ function FormatMegabytes(int $byte): string {
426426
</div>
427427
<div class="monitoring-url-param">
428428
<input type="checkbox" class="update-monitoring-endpoint-url" name="skip_apps" id="skip_apps" checked>
429-
<label for="skip_apps"><?php p($l->t('Skip app updates (including app updates will send an external request to the app store)')) ?></label>
429+
<label for="skip_apps"><?php p($l->t('Skip apps section (including apps section will send an external request to the app store)')) ?></label>
430430
</div>
431431
<div class="monitoring-url-param">
432432
<input type="checkbox" class="update-monitoring-endpoint-url" name="skip_update" id="skip_update" checked>

0 commit comments

Comments
 (0)