Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 88659f1fa6 | |||
| c1e10f14a3 | |||
| 0881a0fa71 | |||
| e91209f7cb | |||
| 828d6bc456 | |||
| f945573f09 | |||
| 296430e4d7 | |||
| 7b517fa290 | |||
| 2c9a56f217 | |||
| 986b101040 |
@@ -1,494 +1,122 @@
|
||||
[
|
||||
{
|
||||
"timestamp": 1756496746582,
|
||||
"timestamp": 1756499536862,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25277186048,
|
||||
"memoryFree": 492617728,
|
||||
"memoryUsagePercent": 98.08839162190756,
|
||||
"memoryEfficiency": 1.9116083780924384,
|
||||
"memoryUsed": 25283330048,
|
||||
"memoryFree": 486473728,
|
||||
"memoryUsagePercent": 98.11223347981772,
|
||||
"memoryEfficiency": 1.8877665201822822,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.24197823660714285,
|
||||
"cpuLoad": 0.21784319196428573,
|
||||
"platform": "darwin",
|
||||
"uptime": 5182900
|
||||
"uptime": 5185690
|
||||
},
|
||||
{
|
||||
"timestamp": 1756496776582,
|
||||
"timestamp": 1756499566862,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25447661568,
|
||||
"memoryFree": 322142208,
|
||||
"memoryUsagePercent": 98.74992370605469,
|
||||
"memoryEfficiency": 1.2500762939453125,
|
||||
"memoryUsed": 25547767808,
|
||||
"memoryFree": 222035968,
|
||||
"memoryUsagePercent": 99.13838704427084,
|
||||
"memoryEfficiency": 0.8616129557291572,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.1962890625,
|
||||
"cpuLoad": 0.181396484375,
|
||||
"platform": "darwin",
|
||||
"uptime": 5182930
|
||||
"uptime": 5185720
|
||||
},
|
||||
{
|
||||
"timestamp": 1756496806600,
|
||||
"timestamp": 1756499596863,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25413042176,
|
||||
"memoryFree": 356761600,
|
||||
"memoryUsagePercent": 98.61558278401694,
|
||||
"memoryEfficiency": 1.3844172159830634,
|
||||
"memoryUsed": 25573294080,
|
||||
"memoryFree": 196509696,
|
||||
"memoryUsagePercent": 99.23744201660156,
|
||||
"memoryEfficiency": 0.7625579833984375,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.22129603794642858,
|
||||
"cpuLoad": 0.17428152901785715,
|
||||
"platform": "darwin",
|
||||
"uptime": 5182960
|
||||
"uptime": 5185750
|
||||
},
|
||||
{
|
||||
"timestamp": 1756496836604,
|
||||
"timestamp": 1756499626864,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25516834816,
|
||||
"memoryFree": 252968960,
|
||||
"memoryUsagePercent": 99.01835123697916,
|
||||
"memoryEfficiency": 0.9816487630208428,
|
||||
"memoryUsed": 25607421952,
|
||||
"memoryFree": 162381824,
|
||||
"memoryUsagePercent": 99.3698755900065,
|
||||
"memoryEfficiency": 0.6301244099934991,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.21344866071428573,
|
||||
"cpuLoad": 0.17811802455357142,
|
||||
"platform": "darwin",
|
||||
"uptime": 5182990
|
||||
"uptime": 5185780
|
||||
},
|
||||
{
|
||||
"timestamp": 1756496866605,
|
||||
"timestamp": 1756499656866,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25414123520,
|
||||
"memoryFree": 355680256,
|
||||
"memoryUsagePercent": 98.61977895100912,
|
||||
"memoryEfficiency": 1.380221048990876,
|
||||
"memoryUsed": 25676906496,
|
||||
"memoryFree": 92897280,
|
||||
"memoryUsagePercent": 99.63951110839844,
|
||||
"memoryEfficiency": 0.3604888916015625,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.21822684151785715,
|
||||
"cpuLoad": 0.14320591517857142,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183020
|
||||
"uptime": 5185810
|
||||
},
|
||||
{
|
||||
"timestamp": 1756496896607,
|
||||
"timestamp": 1756499686866,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25196363776,
|
||||
"memoryFree": 573440000,
|
||||
"memoryUsagePercent": 97.77475992838541,
|
||||
"memoryEfficiency": 2.225240071614593,
|
||||
"memoryUsed": 25690243072,
|
||||
"memoryFree": 79560704,
|
||||
"memoryUsagePercent": 99.69126383463541,
|
||||
"memoryEfficiency": 0.3087361653645928,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.20950753348214285,
|
||||
"cpuLoad": 0.12803431919642858,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183050
|
||||
"uptime": 5185840
|
||||
},
|
||||
{
|
||||
"timestamp": 1756496926609,
|
||||
"timestamp": 1756499716867,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25503711232,
|
||||
"memoryFree": 266092544,
|
||||
"memoryUsagePercent": 98.96742502848306,
|
||||
"memoryEfficiency": 1.0325749715169366,
|
||||
"memoryUsed": 25551355904,
|
||||
"memoryFree": 218447872,
|
||||
"memoryUsagePercent": 99.15231068929037,
|
||||
"memoryEfficiency": 0.8476893107096259,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.23154994419642858,
|
||||
"cpuLoad": 0.17728097098214285,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183080
|
||||
"uptime": 5185870
|
||||
},
|
||||
{
|
||||
"timestamp": 1756496956610,
|
||||
"timestamp": 1756499746868,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25550979072,
|
||||
"memoryFree": 218824704,
|
||||
"memoryUsagePercent": 99.15084838867188,
|
||||
"memoryEfficiency": 0.849151611328125,
|
||||
"memoryUsed": 25028608000,
|
||||
"memoryFree": 741195776,
|
||||
"memoryUsagePercent": 97.1237818400065,
|
||||
"memoryEfficiency": 2.876218159993499,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.20741489955357142,
|
||||
"cpuLoad": 0.14596121651785715,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183110
|
||||
"uptime": 5185900
|
||||
},
|
||||
{
|
||||
"timestamp": 1756496986609,
|
||||
"timestamp": 1756499776869,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25552404480,
|
||||
"memoryFree": 217399296,
|
||||
"memoryUsagePercent": 99.15637969970703,
|
||||
"memoryEfficiency": 0.8436203002929688,
|
||||
"memoryUsed": 25660850176,
|
||||
"memoryFree": 108953600,
|
||||
"memoryUsagePercent": 99.57720438639322,
|
||||
"memoryEfficiency": 0.4227956136067803,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.22112165178571427,
|
||||
"cpuLoad": 0.16322544642857142,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183140
|
||||
"uptime": 5185930
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497016611,
|
||||
"timestamp": 1756499806870,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25680560128,
|
||||
"memoryFree": 89243648,
|
||||
"memoryUsagePercent": 99.653689066569,
|
||||
"memoryEfficiency": 0.34631093343099906,
|
||||
"memoryUsed": 25489965056,
|
||||
"memoryFree": 279838720,
|
||||
"memoryUsagePercent": 98.91408284505209,
|
||||
"memoryEfficiency": 1.0859171549479072,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.23615373883928573,
|
||||
"cpuLoad": 0.15792410714285715,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183170
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497046610,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25631408128,
|
||||
"memoryFree": 138395648,
|
||||
"memoryUsagePercent": 99.46295420328775,
|
||||
"memoryEfficiency": 0.5370457967122491,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.19859095982142858,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183200
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497076611,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25655099392,
|
||||
"memoryFree": 114704384,
|
||||
"memoryUsagePercent": 99.55488840738931,
|
||||
"memoryEfficiency": 0.44511159261068656,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.23831612723214285,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183230
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497106613,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25590169600,
|
||||
"memoryFree": 179634176,
|
||||
"memoryUsagePercent": 99.30292765299478,
|
||||
"memoryEfficiency": 0.6970723470052178,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.29031808035714285,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183260
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497136613,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25682378752,
|
||||
"memoryFree": 87425024,
|
||||
"memoryUsagePercent": 99.66074625651041,
|
||||
"memoryEfficiency": 0.3392537434895928,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.26834542410714285,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183290
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497166614,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25591283712,
|
||||
"memoryFree": 178520064,
|
||||
"memoryUsagePercent": 99.3072509765625,
|
||||
"memoryEfficiency": 0.6927490234375,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.2820521763392857,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183320
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497196616,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25577848832,
|
||||
"memoryFree": 191954944,
|
||||
"memoryUsagePercent": 99.25511678059897,
|
||||
"memoryEfficiency": 0.7448832194010322,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.23618861607142858,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183350
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497226617,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25343754240,
|
||||
"memoryFree": 426049536,
|
||||
"memoryUsagePercent": 98.34671020507812,
|
||||
"memoryEfficiency": 1.653289794921875,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.23228236607142858,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183380
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497256617,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25662668800,
|
||||
"memoryFree": 107134976,
|
||||
"memoryUsagePercent": 99.58426157633463,
|
||||
"memoryEfficiency": 0.41573842366537406,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.19471958705357142,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183410
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497286619,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25610125312,
|
||||
"memoryFree": 159678464,
|
||||
"memoryUsagePercent": 99.38036600748697,
|
||||
"memoryEfficiency": 0.6196339925130303,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.19126674107142858,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183440
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497316620,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25256427520,
|
||||
"memoryFree": 513376256,
|
||||
"memoryUsagePercent": 98.0078379313151,
|
||||
"memoryEfficiency": 1.9921620686849053,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.15576171875,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183470
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497346620,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25464700928,
|
||||
"memoryFree": 305102848,
|
||||
"memoryUsagePercent": 98.81604512532553,
|
||||
"memoryEfficiency": 1.1839548746744697,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.21369280133928573,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183500
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497376620,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25632653312,
|
||||
"memoryFree": 137150464,
|
||||
"memoryUsagePercent": 99.46778615315756,
|
||||
"memoryEfficiency": 0.5322138468424384,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.201904296875,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183530
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497406621,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25066160128,
|
||||
"memoryFree": 703643648,
|
||||
"memoryUsagePercent": 97.26950327555338,
|
||||
"memoryEfficiency": 2.730496724446624,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.192626953125,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183560
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497436623,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25574244352,
|
||||
"memoryFree": 195559424,
|
||||
"memoryUsagePercent": 99.24112955729166,
|
||||
"memoryEfficiency": 0.7588704427083428,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.19761439732142858,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183590
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497466624,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25427623936,
|
||||
"memoryFree": 342179840,
|
||||
"memoryUsagePercent": 98.67216746012369,
|
||||
"memoryEfficiency": 1.3278325398763116,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.20005580357142858,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183620
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497496626,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25596116992,
|
||||
"memoryFree": 173686784,
|
||||
"memoryUsagePercent": 99.32600657145181,
|
||||
"memoryEfficiency": 0.6739934285481866,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.19367327008928573,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183650
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497526626,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25207111680,
|
||||
"memoryFree": 562692096,
|
||||
"memoryUsagePercent": 97.81646728515625,
|
||||
"memoryEfficiency": 2.18353271484375,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.15276227678571427,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183680
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497556628,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25510182912,
|
||||
"memoryFree": 259620864,
|
||||
"memoryUsagePercent": 98.99253845214844,
|
||||
"memoryEfficiency": 1.0074615478515625,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.13654436383928573,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183710
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497586629,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25638223872,
|
||||
"memoryFree": 131579904,
|
||||
"memoryUsagePercent": 99.4894027709961,
|
||||
"memoryEfficiency": 0.5105972290039062,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.13361467633928573,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183740
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497616629,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25115246592,
|
||||
"memoryFree": 654557184,
|
||||
"memoryUsagePercent": 97.4599838256836,
|
||||
"memoryEfficiency": 2.5400161743164062,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.12283761160714286,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183770
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497646631,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25625640960,
|
||||
"memoryFree": 144162816,
|
||||
"memoryUsagePercent": 99.4405746459961,
|
||||
"memoryEfficiency": 0.5594253540039062,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.11844308035714286,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183800
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497676631,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25629868032,
|
||||
"memoryFree": 139935744,
|
||||
"memoryUsagePercent": 99.45697784423828,
|
||||
"memoryEfficiency": 0.5430221557617188,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.10808454241071429,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183830
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497706632,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25579716608,
|
||||
"memoryFree": 190087168,
|
||||
"memoryUsagePercent": 99.26236470540366,
|
||||
"memoryEfficiency": 0.7376352945963447,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.11753627232142858,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183860
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497736633,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25617006592,
|
||||
"memoryFree": 152797184,
|
||||
"memoryUsagePercent": 99.40706888834634,
|
||||
"memoryEfficiency": 0.5929311116536553,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.10857282366071429,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183890
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497766634,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25662226432,
|
||||
"memoryFree": 107577344,
|
||||
"memoryUsagePercent": 99.5825449625651,
|
||||
"memoryEfficiency": 0.4174550374349053,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.108642578125,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183920
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497796634,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25651675136,
|
||||
"memoryFree": 118128640,
|
||||
"memoryUsagePercent": 99.5416005452474,
|
||||
"memoryEfficiency": 0.4583994547525947,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.15876116071428573,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183950
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497826636,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25676709888,
|
||||
"memoryFree": 93093888,
|
||||
"memoryUsagePercent": 99.63874816894531,
|
||||
"memoryEfficiency": 0.3612518310546875,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.16842215401785715,
|
||||
"platform": "darwin",
|
||||
"uptime": 5183980
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497856636,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25665978368,
|
||||
"memoryFree": 103825408,
|
||||
"memoryUsagePercent": 99.59710439046225,
|
||||
"memoryEfficiency": 0.40289560953775094,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.19695172991071427,
|
||||
"platform": "darwin",
|
||||
"uptime": 5184010
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497886638,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25674203136,
|
||||
"memoryFree": 95600640,
|
||||
"memoryUsagePercent": 99.62902069091797,
|
||||
"memoryEfficiency": 0.37097930908203125,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.21759905133928573,
|
||||
"platform": "darwin",
|
||||
"uptime": 5184040
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497916639,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25173065728,
|
||||
"memoryFree": 596738048,
|
||||
"memoryUsagePercent": 97.6843516031901,
|
||||
"memoryEfficiency": 2.3156483968099053,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.20626395089285715,
|
||||
"platform": "darwin",
|
||||
"uptime": 5184070
|
||||
},
|
||||
{
|
||||
"timestamp": 1756497946640,
|
||||
"memoryTotal": 25769803776,
|
||||
"memoryUsed": 25338855424,
|
||||
"memoryFree": 430948352,
|
||||
"memoryUsagePercent": 98.32770029703775,
|
||||
"memoryEfficiency": 1.672299702962249,
|
||||
"cpuCount": 14,
|
||||
"cpuLoad": 0.24553571428571427,
|
||||
"platform": "darwin",
|
||||
"uptime": 5184100
|
||||
"uptime": 5185960
|
||||
}
|
||||
]
|
||||
@@ -33,7 +33,7 @@ jobs:
|
||||
# Remove sensitive files/directories if they exist
|
||||
echo "Removing sensitive files..."
|
||||
rm -rf .gitea/ || true
|
||||
rm -rf scripts/ || true
|
||||
rm -rf scripts/install-gitea-runner.sh || true
|
||||
rm -rf .drone* || true
|
||||
rm -rf photo-sharing-prd.md || true
|
||||
rm -rf CLAUDE.md || true
|
||||
|
||||
@@ -179,37 +179,9 @@ jobs:
|
||||
sarif_file: 'trivy-frontend.sarif'
|
||||
category: 'frontend-vulnerabilities'
|
||||
|
||||
publish-manifest:
|
||||
needs: [build-backend, build-frontend]
|
||||
if: github.event_name == 'release' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
|
||||
steps:
|
||||
- name: Log in to Container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Create and push multi-arch manifest for Backend
|
||||
run: |
|
||||
docker manifest create \
|
||||
${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE_NAME }}:latest \
|
||||
--amend ${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE_NAME }}:latest-amd64 \
|
||||
--amend ${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE_NAME }}:latest-arm64
|
||||
docker manifest push ${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE_NAME }}:latest
|
||||
|
||||
- name: Create and push multi-arch manifest for Frontend
|
||||
run: |
|
||||
docker manifest create \
|
||||
${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}:latest \
|
||||
--amend ${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}:latest-amd64 \
|
||||
--amend ${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}:latest-arm64
|
||||
docker manifest push ${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}:latest
|
||||
# Note: The publish-manifest job is not needed since docker/build-push-action@v5
|
||||
# automatically creates multi-arch manifests when building for multiple platforms.
|
||||
# The images are already properly tagged and include all architectures.
|
||||
|
||||
summary:
|
||||
needs: [build-backend, build-frontend]
|
||||
|
||||
+131
-10
@@ -4,27 +4,62 @@ This guide covers multiple deployment options for PicPeak, from simple local set
|
||||
|
||||
## 🎯 Quick Start - Simple Setup (Recommended for Beginners)
|
||||
|
||||
For the easiest installation without Docker or complex configurations, use our **simple setup script**:
|
||||
For the easiest installation without Docker or complex configurations, use our **unified setup script**:
|
||||
|
||||
```bash
|
||||
curl -fsSL https://raw.githubusercontent.com/yourusername/wedding-photo-sharing/main/scripts/simple-setup.sh -o setup.sh && \
|
||||
curl -fsSL https://raw.githubusercontent.com/the-luap/picpeak/main/scripts/setup.sh -o setup.sh && \
|
||||
chmod +x setup.sh && \
|
||||
sudo ./setup.sh
|
||||
```
|
||||
|
||||
This automated script handles everything including OS detection, dependencies, database setup, and service configuration. Perfect for:
|
||||
This automated script handles everything including:
|
||||
- Choice between Docker or Native installation
|
||||
- OS detection and dependency installation
|
||||
- Database setup and service configuration
|
||||
- SSL/HTTPS setup (optional)
|
||||
|
||||
Perfect for:
|
||||
- Small to medium deployments
|
||||
- Local or VPS installations
|
||||
- Users who prefer avoiding Docker complexity
|
||||
- Users new to server management
|
||||
- Quick testing and evaluation
|
||||
|
||||
👉 **See [SIMPLE_SETUP_GUIDE.md](./SIMPLE_SETUP_GUIDE.md) for detailed instructions.**
|
||||
👉 **See [SIMPLE_SETUP.md](./SIMPLE_SETUP.md) for detailed instructions.**
|
||||
|
||||
---
|
||||
|
||||
## 🐳 Docker Compose Deployment
|
||||
|
||||
This section covers deploying PicPeak using Docker Compose with direct port exposure. For internet-facing deployments, you'll need to add a reverse proxy (nginx, Traefik, Caddy, etc.) for SSL/HTTPS.
|
||||
### Option 1: Using Pre-built Images (Recommended)
|
||||
|
||||
PicPeak provides official Docker images via GitHub Container Registry for quick deployment without building:
|
||||
|
||||
```bash
|
||||
# Clone repository for configuration files
|
||||
git clone https://github.com/the-luap/picpeak.git
|
||||
cd picpeak
|
||||
|
||||
# Copy and configure environment
|
||||
cp .env.example .env
|
||||
nano .env # Edit with your values
|
||||
|
||||
# Use pre-built images deployment
|
||||
docker compose -f docker-compose.production.yml up -d
|
||||
```
|
||||
|
||||
The production compose file uses:
|
||||
- **Backend**: `ghcr.io/the-luap/picpeak/backend:latest`
|
||||
- **Frontend**: `ghcr.io/the-luap/picpeak/frontend:latest`
|
||||
|
||||
Available tags:
|
||||
- `latest` - Latest stable release
|
||||
- `main` - Latest main branch build
|
||||
- `develop` - Development branch (may be unstable)
|
||||
- `v1.0.0` - Specific version tags
|
||||
|
||||
### Option 2: Building from Source
|
||||
|
||||
If you need to customize the application or the pre-built images aren't available, you can build locally:
|
||||
|
||||
## 📋 Table of Contents
|
||||
|
||||
@@ -46,6 +81,38 @@ This section covers deploying PicPeak using Docker Compose with direct port expo
|
||||
|
||||
## 🚀 Quick Start
|
||||
|
||||
### Method 1: Using Pre-built Images (Fastest)
|
||||
|
||||
1. **Clone the repository for configs**
|
||||
```bash
|
||||
git clone https://github.com/the-luap/picpeak.git
|
||||
cd picpeak
|
||||
```
|
||||
|
||||
2. **Set up environment**
|
||||
```bash
|
||||
cp .env.example .env
|
||||
nano .env # Edit with your values
|
||||
```
|
||||
|
||||
3. **Create required directories**
|
||||
```bash
|
||||
mkdir -p events/active events/archived data logs backup storage
|
||||
chmod -R 755 events data logs backup storage
|
||||
```
|
||||
|
||||
4. **Deploy using pre-built images**
|
||||
```bash
|
||||
docker compose -f docker-compose.production.yml up -d
|
||||
```
|
||||
|
||||
5. **Check logs**
|
||||
```bash
|
||||
docker compose -f docker-compose.production.yml logs -f
|
||||
```
|
||||
|
||||
### Method 2: Building from Source
|
||||
|
||||
1. **Clone the repository**
|
||||
```bash
|
||||
git clone https://github.com/the-luap/picpeak.git
|
||||
@@ -64,8 +131,9 @@ This section covers deploying PicPeak using Docker Compose with direct port expo
|
||||
chmod -R 755 events data logs backup storage
|
||||
```
|
||||
|
||||
4. **Deploy**
|
||||
4. **Build and deploy**
|
||||
```bash
|
||||
docker compose build
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
@@ -145,12 +213,29 @@ SMTP_PASS=your-sendgrid-api-key
|
||||
|
||||
## 📦 Deployment
|
||||
|
||||
### Build and Start Services
|
||||
### Using Pre-built Images (Fastest)
|
||||
|
||||
```bash
|
||||
# Build images
|
||||
# Pull latest images from GitHub Container Registry
|
||||
docker pull ghcr.io/the-luap/picpeak/backend:latest
|
||||
docker pull ghcr.io/the-luap/picpeak/frontend:latest
|
||||
|
||||
# Start services using production compose file
|
||||
docker compose -f docker-compose.production.yml up -d
|
||||
|
||||
# View running containers
|
||||
docker compose ps
|
||||
```
|
||||
|
||||
### Building from Source (For Customization)
|
||||
|
||||
```bash
|
||||
# Build images locally
|
||||
docker compose build
|
||||
|
||||
# Or build with no cache for clean build
|
||||
docker compose build --no-cache
|
||||
|
||||
# Start all services
|
||||
docker compose up -d
|
||||
|
||||
@@ -446,14 +531,50 @@ The application includes a built-in backup service. Configure it in the admin pa
|
||||
|
||||
### Updates
|
||||
|
||||
#### Method 1: Using Pre-built Images (Recommended)
|
||||
|
||||
```bash
|
||||
# Pull latest changes (for configuration updates)
|
||||
git pull
|
||||
|
||||
# Pull latest images from GitHub Container Registry
|
||||
docker compose -f docker-compose.production.yml pull
|
||||
|
||||
# Restart with new images
|
||||
docker compose -f docker-compose.production.yml down
|
||||
docker compose -f docker-compose.production.yml up -d
|
||||
|
||||
# Verify services are healthy
|
||||
docker compose -f docker-compose.production.yml ps
|
||||
```
|
||||
|
||||
#### Method 2: Building from Source
|
||||
|
||||
```bash
|
||||
# Pull latest changes
|
||||
git pull
|
||||
|
||||
# Rebuild and restart
|
||||
docker compose down
|
||||
docker compose build
|
||||
docker compose build --no-cache
|
||||
docker compose up -d
|
||||
|
||||
# Verify services are healthy
|
||||
docker compose ps
|
||||
```
|
||||
|
||||
#### Specific Version Updates
|
||||
|
||||
To use a specific version of the images:
|
||||
|
||||
```bash
|
||||
# Edit docker-compose.production.yml to specify version tags
|
||||
# Change: ghcr.io/the-luap/picpeak/backend:latest
|
||||
# To: ghcr.io/the-luap/picpeak/backend:v1.0.0
|
||||
|
||||
# Then pull and restart
|
||||
docker compose -f docker-compose.production.yml pull
|
||||
docker compose -f docker-compose.production.yml up -d
|
||||
```
|
||||
|
||||
### Database Migrations
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "picpeak-backend",
|
||||
"version": "1.0.104",
|
||||
"version": "1.0.106",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "picpeak-backend",
|
||||
"version": "1.0.104",
|
||||
"version": "1.0.106",
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "^3.850.0",
|
||||
"@aws-sdk/lib-storage": "^3.850.0",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "picpeak-backend",
|
||||
"version": "1.0.104",
|
||||
"version": "1.0.106",
|
||||
"description": "Backend for PicPeak event photo sharing platform",
|
||||
"main": "server.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -60,8 +60,8 @@ router.put('/events/:eventId/feedback-settings',
|
||||
settings: updatedSettings
|
||||
}, eventId, {
|
||||
type: 'admin',
|
||||
id: req.user.id,
|
||||
name: req.user.username
|
||||
id: req.admin.id,
|
||||
name: req.admin.username
|
||||
});
|
||||
|
||||
res.json(updatedSettings);
|
||||
@@ -167,7 +167,7 @@ router.put('/feedback/:feedbackId/:action',
|
||||
return res.status(400).json({ error: 'Invalid action' });
|
||||
}
|
||||
|
||||
await feedbackService.moderateFeedback(feedbackId, action, req.user.id);
|
||||
await feedbackService.moderateFeedback(feedbackId, action, req.admin.id);
|
||||
|
||||
res.json({ success: true });
|
||||
} catch (error) {
|
||||
@@ -184,7 +184,7 @@ router.delete('/feedback/:feedbackId',
|
||||
try {
|
||||
const { feedbackId } = req.params;
|
||||
|
||||
await feedbackService.deleteFeedback(feedbackId, req.user.id);
|
||||
await feedbackService.deleteFeedback(feedbackId, req.admin.id);
|
||||
|
||||
res.json({ success: true });
|
||||
} catch (error) {
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:15-alpine
|
||||
container_name: picpeak-postgres
|
||||
environment:
|
||||
POSTGRES_USER: ${DB_USER:-picpeak}
|
||||
POSTGRES_PASSWORD: ${DB_PASSWORD}
|
||||
POSTGRES_DB: ${DB_NAME:-picpeak}
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql/data
|
||||
networks:
|
||||
- picpeak-network
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-picpeak}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
container_name: picpeak-redis
|
||||
command: redis-server --requirepass ${REDIS_PASSWORD}
|
||||
volumes:
|
||||
- redis-data:/data
|
||||
networks:
|
||||
- picpeak-network
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
backend:
|
||||
# Use pre-built image from GitHub Container Registry
|
||||
image: ghcr.io/the-luap/picpeak/backend:latest
|
||||
container_name: picpeak-backend
|
||||
env_file: .env
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- DB_HOST=postgres
|
||||
- REDIS_HOST=redis
|
||||
- PHOTOS_DIR=/app/storage/events
|
||||
volumes:
|
||||
- ./storage:/app/storage
|
||||
- ./logs:/app/logs
|
||||
- ./data:/app/data
|
||||
ports:
|
||||
- "${BACKEND_PORT:-3001}:3000"
|
||||
networks:
|
||||
- picpeak-network
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
redis:
|
||||
condition: service_healthy
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:3000/api/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
||||
frontend:
|
||||
# Use pre-built image from GitHub Container Registry
|
||||
image: ghcr.io/the-luap/picpeak/frontend:latest
|
||||
container_name: picpeak-frontend
|
||||
environment:
|
||||
- VITE_API_URL=${FRONTEND_API_URL:-http://localhost:3001}
|
||||
ports:
|
||||
- "${FRONTEND_PORT:-3000}:80"
|
||||
networks:
|
||||
- picpeak-network
|
||||
depends_on:
|
||||
- backend
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
||||
# Optional: Nginx reverse proxy for production with SSL
|
||||
# Uncomment and configure if you want built-in HTTPS support
|
||||
# nginx:
|
||||
# image: nginx:alpine
|
||||
# container_name: picpeak-nginx
|
||||
# ports:
|
||||
# - "80:80"
|
||||
# - "443:443"
|
||||
# volumes:
|
||||
# - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
# - ./nginx/ssl:/etc/nginx/ssl:ro
|
||||
# - ./nginx/conf.d:/etc/nginx/conf.d:ro
|
||||
# networks:
|
||||
# - picpeak-network
|
||||
# depends_on:
|
||||
# - frontend
|
||||
# - backend
|
||||
# restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
postgres-data:
|
||||
driver: local
|
||||
redis-data:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
picpeak-network:
|
||||
driver: bridge
|
||||
@@ -4,6 +4,10 @@ server {
|
||||
root /usr/share/nginx/html;
|
||||
index index.html;
|
||||
|
||||
# Allow larger file uploads (up to 100MB)
|
||||
client_max_body_size 100M;
|
||||
client_body_timeout 300s;
|
||||
|
||||
# Gzip compression
|
||||
gzip on;
|
||||
gzip_vary on;
|
||||
@@ -49,6 +53,10 @@ server {
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_cache_bypass $http_upgrade;
|
||||
proxy_read_timeout 86400;
|
||||
|
||||
# Allow larger uploads for API endpoints
|
||||
client_max_body_size 100M;
|
||||
client_body_timeout 300s;
|
||||
}
|
||||
|
||||
# Photo serving proxy
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "picpeak-frontend",
|
||||
"version": "1.0.104",
|
||||
"version": "1.0.107",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "picpeak-frontend",
|
||||
"version": "1.0.104",
|
||||
"version": "1.0.107",
|
||||
"dependencies": {
|
||||
"@tanstack/react-query": "^5.0.0",
|
||||
"@tiptap/extension-character-count": "^2.26.1",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "picpeak-frontend",
|
||||
"private": true,
|
||||
"version": "1.0.104",
|
||||
"version": "1.0.107",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
@@ -118,7 +118,12 @@ export const FeedbackModerationPanel: React.FC<FeedbackModerationPanelProps> = (
|
||||
</span>
|
||||
<span className="text-neutral-500">•</span>
|
||||
<span className="text-neutral-500">
|
||||
{format(parseISO(item.created_at), 'MMM d, h:mm a')}
|
||||
{format(
|
||||
typeof item.created_at === 'string'
|
||||
? parseISO(item.created_at)
|
||||
: new Date(item.created_at),
|
||||
'MMM d, h:mm a'
|
||||
)}
|
||||
</span>
|
||||
</div>
|
||||
<p className="mt-1 text-sm text-neutral-700">{item.comment}</p>
|
||||
|
||||
@@ -194,7 +194,7 @@ export const GallerySidebar: React.FC<GallerySidebarProps> = ({
|
||||
disabled={isDownloading}
|
||||
className="w-full"
|
||||
>
|
||||
{t('gallery.downloadSelected')} ({selectedCount})
|
||||
{t('gallery.downloadSelected', { count: selectedCount })} ({selectedCount})
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -48,10 +48,25 @@ api.interceptors.request.use(
|
||||
const galleryMatch = config.url?.match(/gallery\/([^\/]+)/);
|
||||
|
||||
if (galleryMatch && galleryMatch[1]) {
|
||||
const gallerySlug = galleryMatch[1];
|
||||
const galleryIdOrSlug = galleryMatch[1];
|
||||
// Remove any query parameters from the slug
|
||||
const cleanSlug = gallerySlug.split('?')[0];
|
||||
const token = localStorage.getItem(`gallery_token_${cleanSlug}`);
|
||||
const cleanIdOrSlug = galleryIdOrSlug.split('?')[0];
|
||||
|
||||
// Check if it's a numeric ID (for upload endpoints)
|
||||
let token = null;
|
||||
if (/^\d+$/.test(cleanIdOrSlug)) {
|
||||
// It's an event ID - try to find the token from current page slug
|
||||
const pathParts = window.location.pathname.split('/');
|
||||
if (pathParts[1] === 'gallery' && pathParts[2]) {
|
||||
const gallerySlug = pathParts[2];
|
||||
const cleanSlug = gallerySlug.split('?')[0];
|
||||
token = localStorage.getItem(`gallery_token_${cleanSlug}`);
|
||||
}
|
||||
} else {
|
||||
// It's a slug - use it directly
|
||||
token = localStorage.getItem(`gallery_token_${cleanIdOrSlug}`);
|
||||
}
|
||||
|
||||
if (token) {
|
||||
if (!config.headers) {
|
||||
config.headers = {};
|
||||
|
||||
@@ -134,7 +134,6 @@
|
||||
"sortByName": "Nach Name sortieren",
|
||||
"sortBySize": "Nach Größe sortieren",
|
||||
"allPhotos": "Alle Fotos",
|
||||
"downloadSelected": "Ausgewählte herunterladen",
|
||||
"shareGallery": "Galerie teilen",
|
||||
"needHelp": "Hilfe benötigt? Kontaktieren Sie uns unter",
|
||||
"noPhotosFound": "Keine Fotos gefunden",
|
||||
|
||||
@@ -279,12 +279,38 @@ export const EventDetailsPage: React.FC = () => {
|
||||
|
||||
const handleCopyLink = async () => {
|
||||
try {
|
||||
await navigator.clipboard.writeText(event.share_link);
|
||||
// Check if share_link exists
|
||||
if (!event.share_link) {
|
||||
toast.error(t('errors.noShareLink', 'No share link available'));
|
||||
return;
|
||||
}
|
||||
|
||||
// Try modern clipboard API first
|
||||
if (navigator.clipboard && window.isSecureContext) {
|
||||
await navigator.clipboard.writeText(event.share_link);
|
||||
} else {
|
||||
// Fallback for non-HTTPS contexts or older browsers
|
||||
const textArea = document.createElement('textarea');
|
||||
textArea.value = event.share_link;
|
||||
textArea.style.position = 'fixed';
|
||||
textArea.style.left = '-999999px';
|
||||
textArea.style.top = '-999999px';
|
||||
document.body.appendChild(textArea);
|
||||
textArea.focus();
|
||||
textArea.select();
|
||||
const successful = document.execCommand('copy');
|
||||
document.body.removeChild(textArea);
|
||||
if (!successful) {
|
||||
throw new Error('Copy failed');
|
||||
}
|
||||
}
|
||||
|
||||
setCopiedLink(true);
|
||||
setTimeout(() => setCopiedLink(false), 2000);
|
||||
toast.success(t('toast.linkCopied'));
|
||||
} catch (err) {
|
||||
toast.error(t('errors.somethingWentWrong'));
|
||||
console.error('Copy failed:', err);
|
||||
toast.error(t('errors.copyFailed', 'Failed to copy link. Please copy manually.'));
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user